changeset 8968:eb272f8584c8 8u45-b07

Automated merge with http://hg.openjdk.java.net/openjfx/8u40/rt
author kcr
date Fri, 06 Feb 2015 11:18:35 -0800
parents 6cc08ec1ea82 ab4210eb0733
children 1702ca4a2eb7 7a457e5e096b
files .hgtags build.properties
diffstat 3 files changed, 37 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Feb 03 21:15:15 2015 -0800
+++ b/.hgtags	Fri Feb 06 11:18:35 2015 -0800
@@ -213,7 +213,11 @@
 99b445f2721193142a2fd8b206b9f949c134639d 8u40-b18
 2f0d0cab40c443fa49ac7117b1f9a6b32723a958 8u40-b19
 7d93ba533809d1f247bf39beb9179b22aaa2432c 8u40-b20
+39bbac39d4ba903b2275470c67677152900a4e2b 8u45-b01
 f88433e126cd1240666ca5316cf296d94abc15c8 8u40-b21
+2fba328b97fb89614d9fe615cbc4908836e83a80 8u45-b02
+d9633ef51015b2a8e2db14cdbd17f7d4a21fb67f 8u45-b03
+e7c2b5f84b63c88b8ba2e2234c94a7756aa0e4aa 8u45-b04
 005254e22af36cea855c584b4ae4cf09f285819b 8u31-b02
 cb1597094e0803aa56013d79bd26e54b08b98cef 8u31-b03
 d865ed51c537d80655339bf01928d52bf8e59a35 8u31-b04
@@ -227,5 +231,7 @@
 ce317dfcb9a96943403d88d86abcda4c7f182ff5 8u31-b12
 f1388961b89fc39dc86992e0b9a8ffab8c75d1e5 8u31-b13
 fed0a08c47e9b9be421eb49dabc7bc872a6f7de8 8u40-b22
+e7ceb6237e1a8a6a53120ed77243611937b801b4 8u45-b05
 2c8e07ca29f358c98c2040c28cd1726d3dc6facb 8u40-b23
+12ff255c338e2a6b21ef1125aa982eea8415c086 8u45-b06
 fee546b5171799a21cd7b2dc0f5cc3447176c104 8u40-b24
--- a/build.properties	Tue Feb 03 21:15:15 2015 -0800
+++ b/build.properties	Fri Feb 06 11:18:35 2015 -0800
@@ -33,10 +33,10 @@
 jfx.release.milestone=fcs
 # Note: For fcs builds the suffix should be blank
 jfx.release.suffix=
-jfx.release.name=8u40
+jfx.release.name=8u45
 jfx.release.major.version=8
 jfx.release.minor.version=0
-jfx.release.micro.version=40
+jfx.release.micro.version=45
 
 ##############################################################################
 #
--- a/modules/media/src/main/native/gstreamer/plugins/audioconverter/audioconverter.c	Tue Feb 03 21:15:15 2015 -0800
+++ b/modules/media/src/main/native/gstreamer/plugins/audioconverter/audioconverter.c	Fri Feb 06 11:18:35 2015 -0800
@@ -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