changeset 8988:24bd4905d09f 9-b60

Automated merge with http://hg.openjdk.java.net/openjfx/9-dev/rt
author kcr
date Tue, 14 Apr 2015 12:50:36 -0700
parents e625b1deb0df a35a98a9ff65
children 3a05e80857ba bd63731a33f8
files modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppBundler.java
diffstat 2 files changed, 44 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Apr 14 12:59:54 2015 -0600
+++ b/.hgtags	Tue Apr 14 12:50:36 2015 -0700
@@ -258,8 +258,12 @@
 fb56d78f280832f3e5dd020376fa7e2db631fcb2 9-b44
 7d93ba533809d1f247bf39beb9179b22aaa2432c 8u40-b20
 b8e7fe785e3824e161db73fd33ed03675648e7a5 9-b45
+39bbac39d4ba903b2275470c67677152900a4e2b 8u45-b01
 f88433e126cd1240666ca5316cf296d94abc15c8 8u40-b21
 ee5853726d66eee0395391adae91584b2f86d21e 9-b46
+2fba328b97fb89614d9fe615cbc4908836e83a80 8u45-b02
+d9633ef51015b2a8e2db14cdbd17f7d4a21fb67f 8u45-b03
+e7c2b5f84b63c88b8ba2e2234c94a7756aa0e4aa 8u45-b04
 005254e22af36cea855c584b4ae4cf09f285819b 8u31-b02
 cb1597094e0803aa56013d79bd26e54b08b98cef 8u31-b03
 d865ed51c537d80655339bf01928d52bf8e59a35 8u31-b04
@@ -275,25 +279,36 @@
 a6d7bdf3267b7031ab4a8e91480fb0e721908fcd 9-b47
 fed0a08c47e9b9be421eb49dabc7bc872a6f7de8 8u40-b22
 24b485827a6d4d0f4280ea6fcd13cb5eb91d7d2c 9-b48
+e7ceb6237e1a8a6a53120ed77243611937b801b4 8u45-b05
 2c8e07ca29f358c98c2040c28cd1726d3dc6facb 8u40-b23
 92264dad45e2bffe84ec3f0a4cc86981f7786d36 9-b49
+12ff255c338e2a6b21ef1125aa982eea8415c086 8u45-b06
 a69f48b048e5a687fd683f22328418f9ae2eaf28 8u60-b01
 fee546b5171799a21cd7b2dc0f5cc3447176c104 8u40-b24
 56f28bdec0491d0bd04eb6744ada1b7a5bf78ac0 8u60-b01
+eb272f8584c8346d7438e2b23d0661980d512c07 8u45-b07
 47c6b87c5ab972800ca1c0a4818382035c2012ad 9-b50
 6cc08ec1ea825b4bd1273e522e61e1b9efda4172 8u40-b25
 adae30a7fe1ec2eb45de08ba3c58a276a60a73bf 8u60-b02
+9a0bb4610ea0e3fe93008c8ddf2757fdb9c3be35 8u45-b08
 5d3d6549067c18396d4f6a97adef23739c0ff57a 9-b51
 298ec4ec6b354f2eb74a200b3415bc4566ddc1a7 8u40-b26
 13970a967383d6fa104858157d327c78077fe3b9 8u60-b03
+88882082520b7195b4e669955782ffc6757db7ac 8u45-b09
 3673a70e0e5ea4b26fbff1b29d8151ff147fdce9 9-b52
 e00e97499831954b5126d96da1299b1ecdf69e15 8u40-b27
 b76562e466d6e8b47e1d7b2cdb64eb53578eae7b 8u60-b04
 323febe44dc27bead06e734e3d71a1e0020e0c56 9-b53
 5fc0ddb4277679b69970d2993fefcda1fb711ae7 8u60-b05
 7f80261fd43cd42488dae00fb0e534ea40529bd4 9-b54
+f5b6e9bfedc64c3bc27d1fdd8888f5386b9c9f36 8u45-b10
+f5b6e9bfedc64c3bc27d1fdd8888f5386b9c9f36 8u45-b11
+63e96de9d0965ad671cc7694a15b651a15dff9ed 8u45-b12
+93e3b40039ac3c0d6086e15d86dc8127d28f1587 8u45-b13
 5fc0ddb4277679b69970d2993fefcda1fb711ae7 8u60-b06
 cbe942c0e3bb4ece7864a1840af15e5ae49cb9a9 9-b55
+f5b6e9bfedc64c3bc27d1fdd8888f5386b9c9f36 8u45-b11
+b7d32ba7de74acdc83b06ca4d82c6c5e30946cd8 8u45-b11
 537f7640d63cf8e0b37592a62604a7d29b606c48 8u60-b06
 2f8b9acb3035b798db982f4ce957ada7f3a0f672 8u60-b07
 28006a7446da8cb8f4d30f8821120c9702ceb9ed 8u60-b08
--- a/modules/media/src/main/native/gstreamer/plugins/audioconverter/audioconverter.c	Tue Apr 14 12:59:54 2015 -0600
+++ b/modules/media/src/main/native/gstreamer/plugins/audioconverter/audioconverter.c	Tue Apr 14 12:50:36 2015 -0700
@@ -644,11 +644,8 @@
     // If between FLUSH_START and FLUSH_STOP, reject new buffers.
     if (decode->is_flushing)
     {
-        // Unref the input buffer.
-        // INLINE - gst_buffer_unref()
-        gst_buffer_unref(buf);
-
-        return GST_FLOW_WRONG_STATE;
+        ret = GST_FLOW_WRONG_STATE;
+        goto _exit;
     }
 
     // Reset state on discont buffer if not after FLUSH_STOP.
@@ -746,13 +743,10 @@
                                     decode->isFormatInitialized = TRUE;
                                     decode->isAudioConverterReady = TRUE;
                                 } else {
-                                    // Unref the input buffer.
-                                    // INLINE - gst_buffer_unref()
-                                    gst_buffer_unref(buf);
-
                                     gst_caps_unref(sink_peer_caps);
 
-                                    return GST_FLOW_ERROR;
+                                    ret = GST_FLOW_ERROR;
+                                    goto _exit;
                                 }
                             } else {
                                 gint layer;
@@ -786,14 +780,11 @@
                                             packetListener,
                                             audioStreamTypeHint,
                                             &decode->audioStreamID)) {
-                // Unref the input buffer.
-                // INLINE - gst_buffer_unref()
-                gst_buffer_unref(buf);
-
 #if ENABLE_PRINT_SPEW
                 g_print("AudioFileStreamOpen failed\n");
 #endif
-                return GST_FLOW_ERROR;
+                ret = GST_FLOW_ERROR;
+                goto _exit;
             }
         }
     }
@@ -814,15 +805,12 @@
 
         OSStatus result = AudioFileStreamParseBytes(decode->audioStreamID, buf_size, buf_data, parserFlags);
 
-        // Unref the input buffer.
-        // INLINE - gst_buffer_unref()
-        gst_buffer_unref(buf);
-
         if(noErr != result) {
 #if ENABLE_PRINT_SPEW
             g_print("AudioFileStreamParseBytes %d\n", result);
 #endif
-            return GST_FLOW_ERROR;
+            ret = GST_FLOW_ERROR;
+            goto _exit;
         }
     } else {
         if(!decode->is_synced && NULL != decode->audioConverter) {
@@ -836,10 +824,6 @@
 
         packetListener((void*)decode, buf_size, 1, (const void*)buf_data,
                        &packetDescriptions);
-
-        // Unref the input buffer.
-        // INLINE - gst_buffer_unref()
-        gst_buffer_unref(buf);
     }
 
     // Return without pushing a buffer if format not derived from stream parser.
@@ -849,7 +833,7 @@
 
     // Return without pushing a buffer if format is MPEG audio but no packets are enqueued.
     if(AUDIOCONVERTER_DATA_FORMAT_MPA == decode->data_format && 0 == decode->total_packets) {
-        return GST_FLOW_OK;
+        goto _exit; // GST_FLOW_OK
     }
 
     if(decode->is_synced == FALSE) {
@@ -870,15 +854,12 @@
             // Allocate memory for output packet descriptions.
             decode->outPacketDescription = g_malloc(decode->samples_per_frame*sizeof(AudioStreamPacketDescription));
             if(NULL == decode->outPacketDescription) {
-                return GST_FLOW_ERROR;
+                ret = GST_FLOW_ERROR;
+                goto _exit;
             }
 
             // Save first frame offset.
-            if (GST_BUFFER_OFFSET_IS_VALID(buf)) {
-                decode->initial_offset = GST_BUFFER_OFFSET(buf);
-            } else {
-                decode->initial_offset = 0;
-            }
+            decode->initial_offset = GST_BUFFER_OFFSET_IS_VALID(buf) ? GST_BUFFER_OFFSET(buf) : 0;
 
             // Query for the stream length if it was not set from a header.
             if (AUDIOCONVERTER_STREAM_LENGTH_UNKNOWN == decode->stream_length)
@@ -933,7 +914,8 @@
                                             "mpegversion", G_TYPE_INT, 2,
                                              NULL);
             } else {
-                return GST_FLOW_ERROR;
+                ret = GST_FLOW_ERROR;
+                goto _exit;
             }
 
             if(gst_pad_set_caps (decode->sinkpad, caps) == FALSE)
@@ -983,7 +965,7 @@
 
     if(!decode->isAudioConverterReady) {
         // Return without pushing a buffer if converter is not ready.
-        return GST_FLOW_OK;
+        goto _exit; // GST_FLOW_OK
     } else if(NULL == decode->audioConverter) {
         // Initialize the converter.
         if(noErr != AudioConverterNew(&decode->audioInputFormat,
@@ -993,7 +975,8 @@
             g_print("Failed to initialize AudioConverter\n");
 #endif
             // Return an error if converter cannot be initialized.
-            return GST_FLOW_ERROR;
+            ret = GST_FLOW_ERROR;
+            goto _exit;
         } else if(NULL != decode->cookieData && noErr != AudioConverterSetProperty(decode->audioConverter,
                                                                             kAudioConverterDecompressionMagicCookie,
                                                                             decode->cookieSize, decode->cookieData)) {
@@ -1001,7 +984,8 @@
             g_print("Failed to set AudioConverter magic cookie data\n");
 #endif
             // Return an error if converter cannot be initialized.
-            return GST_FLOW_ERROR;
+            ret = GST_FLOW_ERROR;
+            goto _exit;
         } else if(AUDIOCONVERTER_DATA_FORMAT_AAC == decode->data_format) {
             AudioConverterPrimeInfo primeInfo;
             primeInfo.leadingFrames = 0;
@@ -1023,7 +1007,7 @@
     if(decode->is_priming) {
         // Return without pushing a buffer if there are not enough packets enqueued.
         if(g_queue_get_length(decode->packetDesc) < AUDIOCONVERTER_MPEG_MIN_PACKETS) {
-            return GST_FLOW_OK;
+            goto _exit; // GST_FLOW_OK;
         } else {
             decode->is_priming = FALSE;
         }
@@ -1047,7 +1031,7 @@
                 gst_element_message_full(GST_ELEMENT(decode), GST_MESSAGE_ERROR, GST_CORE_ERROR, GST_CORE_ERROR_SEEK, g_strdup("Decoded audio buffer allocation failed"), NULL, ("audioconverter.c"), ("audioconverter_chain"), 0);
             }
 
-            return ret;
+            goto _exit;
         }
 
         AudioBufferList outputData;
@@ -1067,7 +1051,8 @@
 #endif
             // INLINE - gst_buffer_unref()
             gst_buffer_unref(outbuf);
-            return GST_FLOW_ERROR;
+            ret = GST_FLOW_ERROR;
+            goto _exit;
         }
 
         if(0 == outputDataPacketSize) {
@@ -1095,7 +1080,7 @@
 
         ret = gst_pad_push (decode->srcpad, outbuf);
         if(GST_FLOW_OK != ret) {
-            return ret;
+            goto _exit;
         }
     }
 
@@ -1108,7 +1093,11 @@
         decode->inputOffset = 0;
     }
 
-    return GST_FLOW_OK;
+_exit:
+    // Unref the input buffer.
+    // INLINE - gst_buffer_unref()
+    gst_buffer_unref(buf);
+    return ret;
 }
 
 #if ENABLE_PRINT_SPEW