Request 4301 (accepted)

omxplayer.changes Changed

omxplayer.spec Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/.git/objects/pack/pack-d24b616b1dad00d15e8d5afa3474c4479cb22df0.idx Deleted

omxplayer-2018.03.13.tar.gz/ffmpeg/.git/objects/pack/pack-d24b616b1dad00d15e8d5afa3474c4479cb22df0.pack Deleted

omxplayer-2018.03.13.tar.gz/DllAvFormat.h -> omxplayer-2018.09.04.tar.gz/DllAvFormat.h Changed

omxplayer-2018.03.13.tar.gz/KeyConfig.h -> omxplayer-2018.09.04.tar.gz/KeyConfig.h Changed

omxplayer-2018.03.13.tar.gz/OMXAudioCodecOMX.cpp -> omxplayer-2018.09.04.tar.gz/OMXAudioCodecOMX.cpp Changed

@@ -82,8 +82,8 @@
   m_pCodecContext->debug = 0;
   m_pCodecContext->workaround_bugs = 1;
 
-  if (pCodec->capabilities & CODEC_CAP_TRUNCATED)
-    m_pCodecContext->flags |= CODEC_FLAG_TRUNCATED;
+  if (pCodec->capabilities & AV_CODEC_CAP_TRUNCATED)
+    m_pCodecContext->flags |= AV_CODEC_FLAG_TRUNCATED;
 
   m_channels = 0;
   m_pCodecContext->channels = hints.channels;
@@ -115,7 +115,7 @@
   if( hints.extradata && hints.extrasize > 0 )
   {
     m_pCodecContext->extradata_size = hints.extrasize;
-    m_pCodecContext->extradata = (uint8_t*)m_dllAvUtil.av_mallocz(hints.extrasize + FF_INPUT_BUFFER_PADDING_SIZE);
+    m_pCodecContext->extradata = (uint8_t*)m_dllAvUtil.av_mallocz(hints.extrasize + AV_INPUT_BUFFER_PADDING_SIZE);
     memcpy(m_pCodecContext->extradata, hints.extradata, hints.extrasize);
   }
 
@@ -234,7 +234,7 @@
 
   if (m_iBufferOutputAlloced < m_iBufferOutputUsed + outputSize)
   {
-     m_pBufferOutput = (BYTE*)m_dllAvUtil.av_realloc(m_pBufferOutput, m_iBufferOutputUsed + outputSize + FF_INPUT_BUFFER_PADDING_SIZE);
+     m_pBufferOutput = (BYTE*)m_dllAvUtil.av_realloc(m_pBufferOutput, m_iBufferOutputUsed + outputSize + AV_INPUT_BUFFER_PADDING_SIZE);
      m_iBufferOutputAlloced = m_iBufferOutputUsed + outputSize;
   }

omxplayer-2018.03.13.tar.gz/OMXControl.cpp -> omxplayer-2018.09.04.tar.gz/OMXControl.cpp Changed

@@ -876,6 +876,28 @@
       return OMXControlResult(KeyConfig::ACTION_SET_ALPHA, alpha);
     }
   }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "SetLayer"))
+  {
+    DBusError error;
+    dbus_error_init(&error);
+
+    int64_t layer;
+    dbus_message_get_args(m, &error, DBUS_TYPE_INT64, &layer, DBUS_TYPE_INVALID);
+
+    // Make sure a value is sent for setting layer
+    if (dbus_error_is_set(&error))
+    {
+      CLog::Log(LOGWARNING, "SetLayer D-Bus Error: %s", error.message );
+      dbus_error_free(&error);
+      dbus_respond_ok(m);
+      return KeyConfig::ACTION_BLANK;
+    }
+    else
+    {
+      dbus_respond_int64(m, layer);
+      return OMXControlResult(KeyConfig::ACTION_SET_LAYER, layer);
+    }
+  }
   else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "SetAspectMode"))
   {
     DBusError error;
@@ -1103,6 +1125,27 @@
     dbus_respond_ok(m);
     return KeyConfig::ACTION_HIDE_SUBTITLES;
   }
+  else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "OpenUri"))
+  {
+    DBusError error;
+    dbus_error_init(&error);
+
+    const char *file;
+    dbus_message_get_args(m, &error, DBUS_TYPE_STRING, &file, DBUS_TYPE_INVALID);
+
+    if (dbus_error_is_set(&error))
+    {
+      CLog::Log(LOGWARNING, "Change file D-Bus Error: %s", error.message );
+      dbus_error_free(&error);
+      dbus_respond_ok(m);
+      return KeyConfig::ACTION_BLANK;
+    }
+    else
+    {
+      dbus_respond_string(m, file);
+      return OMXControlResult(KeyConfig::ACTION_CHANGE_FILE, file);
+    }
+  }
   else if (dbus_message_is_method_call(m, OMXPLAYER_DBUS_INTERFACE_PLAYER, "Action"))
   {
     DBusError error;

omxplayer-2018.03.13.tar.gz/OMXPlayerVideo.cpp -> omxplayer-2018.09.04.tar.gz/OMXPlayerVideo.cpp Changed

omxplayer-2018.03.13.tar.gz/OMXPlayerVideo.h -> omxplayer-2018.09.04.tar.gz/OMXPlayerVideo.h Changed

omxplayer-2018.03.13.tar.gz/OMXReader.cpp -> omxplayer-2018.09.04.tar.gz/OMXReader.cpp Changed

omxplayer-2018.03.13.tar.gz/OMXVideo.cpp -> omxplayer-2018.09.04.tar.gz/OMXVideo.cpp Changed

@@ -876,7 +876,7 @@
   }
 }
 
-void COMXVideo::SetAlpha(int alpha)
+void COMXVideo::SetLayer(int layer)
 {
   CSingleLock lock (m_critSection);
   if(!m_is_open)
@@ -887,20 +887,38 @@
   OMX_INIT_STRUCTURE(configDisplay);
 
   configDisplay.nPortIndex = m_omx_render.GetInputPort();
-  configDisplay.set = OMX_DISPLAY_SET_ALPHA;
-  configDisplay.alpha = alpha;
+  configDisplay.set = OMX_DISPLAY_SET_LAYER;
+  configDisplay.layer = layer;
 
   omx_err = m_omx_render.SetConfig(OMX_IndexConfigDisplayRegion, &configDisplay);
   if(omx_err != OMX_ErrorNone)
   {
-    CLog::Log(LOGERROR, "COMXVideo::ALPHA::Open error OMX_IndexConfigDisplayRegion omx_err(0x%08x)\n", omx_err);
+    CLog::Log(LOGERROR, "COMXVideo::LAYER::Open error OMX_IndexConfigDisplayRegion omx_err(0x%08x)\n", omx_err);
   }
 
 }
 
+void COMXVideo::SetAlpha(int alpha)
+{
+  CSingleLock lock (m_critSection);
+  if(!m_is_open)
+    return;
+
+  OMX_ERRORTYPE omx_err;
+  OMX_CONFIG_DISPLAYREGIONTYPE configDisplay;
+  OMX_INIT_STRUCTURE(configDisplay);
 
+  configDisplay.nPortIndex = m_omx_render.GetInputPort();
+  configDisplay.set = OMX_DISPLAY_SET_ALPHA;
+  configDisplay.alpha = alpha;
 
+  omx_err = m_omx_render.SetConfig(OMX_IndexConfigDisplayRegion, &configDisplay);
+  if(omx_err != OMX_ErrorNone)
+  {
+    CLog::Log(LOGERROR, "COMXVideo::ALPHA::Open error OMX_IndexConfigDisplayRegion omx_err(0x%08x)\n", omx_err);
+  }
 
+}
 
 int COMXVideo::GetInputBufferSize()
 {

omxplayer-2018.03.13.tar.gz/OMXVideo.h -> omxplayer-2018.09.04.tar.gz/OMXVideo.h Changed

omxplayer-2018.03.13.tar.gz/README.md -> omxplayer-2018.09.04.tar.gz/README.md Changed

@@ -379,6 +379,23 @@
  2              | `int64`           | Position to seek to, in microseconds
  Return         | `null` or `int64` | If the supplied position is invalid, `null` is returned, otherwise the position (in microseconds) is returned
 
+##### SetAlpha
+
+Set the alpha transparency of the player [0-255].
+
+   Params       |   Type            | Description
+:-------------: | ----------------- | ------------------------------------
+ 1              | `string`          | Path (not currently used)
+ 2              | `int64`           | Alpha value, 0-255
+
+##### SetLayer
+
+Seeks the video playback layer.
+
+   Params       |   Type            | Description
+:-------------: | ----------------- | ------------------------------------
+ 1              | `int64`           | Layer to switch to
+
 ##### Mute
 
 Mute the audio stream.  If the volume is already muted, this does nothing.
@@ -582,6 +599,14 @@
 
 [MPRIS_volume]: http://specifications.freedesktop.org/mpris-spec/latest/Player_Interface.html#Simple-Type:Volume
 
+##### OpenUri (w)
+
+Restart and open another URI for playing.
+
+   Params       |   Type    | Description
+:-------------: | --------- | --------------------------------
+1               | `string`  | URI to play
+
 ##### Position (ro)
 
 Returns the current position of the playing media.

omxplayer-2018.03.13.tar.gz/dbuscontrol.sh -> omxplayer-2018.09.04.tar.gz/dbuscontrol.sh Changed

@@ -30,6 +30,10 @@
 	echo "Paused: $paused"
 	;;
 
+openuri)
+	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.OpenUri string:"$2" >/dev/null
+	;;
+
 volume)
 	volume=`dbus-send --print-reply=double --session --reply-timeout=500 --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Set string:"org.mpris.MediaPlayer2.Player" string:"Volume" ${2:+double:}$2`
 	[ $? -ne 0 ] && exit 1
@@ -57,6 +61,10 @@
 	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.SetAlpha objpath:/not/used int64:$2 >/dev/null
 	;;
 
+setlayer)
+	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.SetLayer int64:$2 >/dev/null
+	;;
+
 setvideopos)
 	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.VideoPos objpath:/not/used string:"$2 $3 $4 $5" >/dev/null
 	;;
@@ -102,7 +110,7 @@
 	echo "$source" | sed 's/^ *//'
 	;;
 *)
-	echo "usage: $0 status|pause|stop|seek|volumeup|volumedown|setposition [position in microseconds]|hidevideo|unhidevideo|togglesubtitles|hidesubtitles|showsubtitles|setvideopos [x1 y1 x2 y2]|setvideocroppos [x1 y1 x2 y2]|setaspectmode [letterbox,fill,stretch,default]|setalpha [alpha (0..255)]|getsource" >&2
+	echo "usage: $0 status|openuri|pause|stop|seek|volumeup|volumedown|setposition [position in microseconds]|hidevideo|unhidevideo|togglesubtitles|hidesubtitles|showsubtitles|setvideopos [x1 y1 x2 y2]|setvideocroppos [x1 y1 x2 y2]|setaspectmode [letterbox,fill,stretch,default]|setalpha [alpha (0..255)]|setlayer [layer]|getsource" >&2
 	exit 1
 	;;
 esac

omxplayer-2018.03.13.tar.gz/ffmpeg/.git/hooks/pre-commit.sample -> omxplayer-2018.09.04.tar.gz/ffmpeg/.git/hooks/pre-commit.sample Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/.git/index -> omxplayer-2018.09.04.tar.gz/ffmpeg/.git/index Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/.git/logs/HEAD -> omxplayer-2018.09.04.tar.gz/ffmpeg/.git/logs/HEAD Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/.git/logs/refs/heads/release/3.3 -> omxplayer-2018.09.04.tar.gz/ffmpeg/.git/logs/refs/heads/release/3.3 Changed

omxplayer-2018.09.04.tar.gz/ffmpeg/.git/objects/pack/pack-30251a9c6fd9f4e50a43e866ec8fdb3948b32600.idx Added

omxplayer-2018.09.04.tar.gz/ffmpeg/.git/objects/pack/pack-30251a9c6fd9f4e50a43e866ec8fdb3948b32600.pack Added

omxplayer-2018.03.13.tar.gz/ffmpeg/.git/packed-refs -> omxplayer-2018.09.04.tar.gz/ffmpeg/.git/packed-refs Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/.git/refs/heads/release/3.3 -> omxplayer-2018.09.04.tar.gz/ffmpeg/.git/refs/heads/release/3.3 Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/.git/shallow -> omxplayer-2018.09.04.tar.gz/ffmpeg/.git/shallow Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/Changelog -> omxplayer-2018.09.04.tar.gz/ffmpeg/Changelog Changed

@@ -1,6 +1,85 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
+version 3.3.8:
+- avcodec/dvdsub_parser: Allocate input padding
+- avcodec/dvdsub_parser: Init output buf/size
+- avcodec/imgconvert: fix possible null pointer dereference
+- avcodec/dirac_dwt_template: Fix signedness regression in interleave()
+- avformat/movenc: Write version 2 of audio atom if channels is not known
+- swresample/arm: rename labels to fix xcode build error
+- avformat/movenc: Check input sample count
+- avcodec/mjpegdec: Check for odd progressive RGB
+- avformat/movenc: Check that frame_types other than EAC3_FRAME_TYPE_INDEPENDENT have a supported substream id
+- avcodec/vp8_parser: Do not leave data/size uninitialized
+- avformat/mms: Add missing chunksize check
+- avformat/pva: Check for EOF before retrying in read_part_of_packet()
+- avformat/rmdec: Do not pass mime type in rm_read_multi() to ff_rm_read_mdpr_codecdata()
+- avcodec/indeo4: Check for end of bitstream in decode_mb_info()
+- avcodec/shorten: Fix undefined addition in shorten_decode_frame()
+- avcodec/shorten: Fix undefined integer overflow
+- avcodec/jpeg2000dec: Fixes invalid shifts in jpeg2000_decode_packets_po_iteration()
+- avcodec/jpeg2000dec: Check that there are enough bytes for all tiles
+- avformat/movenc: Do not pass AVCodecParameters in avpriv_request_sample
+- avcodec/escape124: Fix spelling errors in comment
+- avcodec/ra144: Fix integer overflow in ff_eval_refl()
+- avcodec/cscd: Check output buffer size for lzo.
+- avcodec/escape124: Check buf_size against num_superblocks
+- avcodec/h264_parser: Reduce needed history for parsing mb index
+- avcodec/mjpegdec: Check for end of bitstream in ljpeg_decode_rgb_scan()
+- avcodec/aacdec_fixed: Fix undefined integer overflow in apply_independent_coupling_fixed()
+- avcodec/dirac_dwt_template: Fix undefined behavior in interleave()
+- avutil/common: Fix undefined behavior in av_clip_uintp2_c()
+- fftools/ffmpeg: Fallback to duration if sample rate is unavailable
+- avformat/mov: Only set pkt->duration to non negative values
+- avcodec/h264_ps: Move MAX_LOG2_MAX_FRAME_NUM to header so it can be used in h264_sei
+- avcodec/h264_mc_template: Only prefetch motion if the list is used.
+- avcodec/xwddec: Use ff_set_dimensions()
+- avcodec/wavpack: Fix overflow in adding tail
+- avcodec/shorten: Fix multiple integer overflows
+- avcodec/shorten: Fix undefined shift in fix_bitshift()
+- avcodec/shorten: Fix a negative left shift in shorten_decode_frame()
+- avcodec/shorten: Sanity check nmeans
+- avcodec/shorten: Check non COMM chunk len before skip in decode_aiff_header()
+- avcodec/mjpegdec: Fix integer overflow in ljpeg_decode_rgb_scan()
+- avcodec/truemotion2: Fix overflow in tm2_apply_deltas()
+- avcodec/opus_silk: Change silk_lsf2lpc() slightly toward silk/NLSF2A.c
+- avcodec/amrwbdec: Fix division by 0 in find_hb_gain()
+- avformat/mov: replace a value error by clipping into valid range in mov_read_stsc()
+- avformat/mov: Break out early if chunk_count is 0 in mov_build_index()
+- avcodec/fic: Avoid some magic numbers related to cursors
+- avcodec/g2meet: ask for sample with overflowing RGB
+- avcodec/aacdec_fixed: use 64bit to avoid overflow in rounding in apply_dependent_coupling_fixed()
+- oavcodec/aacpsdsp_template: Use unsigned for hs0X to prevent undefined behavior
+- avcodec/g723_1dec: Clip bits2 in both directions
+- avcodec/mpeg4videoenc: Use 64 bit for times in mpeg4_encode_gop_header()
+- avcodec/mlpdec: Only change noise_type if the related fields are valid
+- indeo4: Decode all or nothing of a band header.
+- avformat/mov: Only fail for STCO/STSC contradictions if both exist
+- avcodec/dirac_dwt: Fix integer overflow in COMPOSE_DD97iH0 / COMPOSE_DD137iL0
+- avcodec/fic: Check available input space for cursor
+- avcodec/g2meet: Check RGB upper limit
+- avcodec/jpeg2000dec: Fix undefined shift in the jpeg2000_decode_packets_po_iteration() CPRL case
+- avcodec/jpeg2000dec: Skip init for component in CPRL if nothing is to be done
+- avcodec/g2meet: Change order of operations to avoid undefined behavior
+- avcodec/flac_parser: Fix infinite loop
+- avcodec/wavpack: Fix integer overflow in DEC_MED() / INC_MED()
+- avcodec/error_resilience: Fix integer overflow in filter181()
+- avcodec/h263dec: Check slice_ret in mspeg4 slice loop
+- avcodec/elsdec: Fix memleaks
+- avcodec/vc1_block: simplify ac_val computation
+- avcodec/ffv1enc: Check that the crc + version combination is supported
+- lavf/http.c: Free allocated client URLContext in case of error.
+- avcodec/dsicinvideo: Fail if there is only a small fraction of the data available that comprises a full frame
+- avcodec/dsicinvideo: Propagate errors from cin_decode_rle()
+- avcodec/dfa: Check dimension against maximum
+- avcodec/cinepak: Skip empty frames
+- avcodec/cinepak: move some checks prior to frame allocation
+- swresample/arm: remove unintentional relocation.
+- doc/APIchanges: Fix typos in hashes
+- avdevice/iec61883: free the private context at the end
+- avdevice/iec61883: return reference counted packets
+
 version 3.3.7:
 - avformat/utils: Check cur_dts in update_initial_timestamps() more
 - avcodec/utils: Enforce minimum width also for VP5/6

omxplayer-2018.03.13.tar.gz/ffmpeg/RELEASE -> omxplayer-2018.09.04.tar.gz/ffmpeg/RELEASE Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/doc/APIchanges -> omxplayer-2018.09.04.tar.gz/ffmpeg/doc/APIchanges Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/doc/Doxyfile -> omxplayer-2018.09.04.tar.gz/ffmpeg/doc/Doxyfile Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/ffmpeg.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/ffmpeg.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/aacdec_fixed.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/aacdec_fixed.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/aacpsdsp_template.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/aacpsdsp_template.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/amrwbdec.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/amrwbdec.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/bitstream_filters.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/bitstream_filters.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/cinepak.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/cinepak.c Changed

@@ -315,14 +315,11 @@
     return AVERROR_INVALIDDATA;
 }
 
-static int cinepak_decode (CinepakContext *s)
+static int cinepak_predecode_check (CinepakContext *s)
 {
-    const uint8_t  *eod = (s->data + s->size);
-    int           i, result, strip_size, frame_flags, num_strips;
-    int           y0 = 0;
+    int           num_strips;
     int           encoded_buf_size;
 
-    frame_flags = s->data[0];
     num_strips  = AV_RB16 (&s->data[8]);
     encoded_buf_size = AV_RB24(&s->data[1]);
 
@@ -353,6 +350,21 @@
             s->sega_film_skip_bytes = 0;
     }
 
+    if (s->size < 10 + s->sega_film_skip_bytes + num_strips * 12)
+        return AVERROR_INVALIDDATA;
+
+    return 0;
+}
+
+static int cinepak_decode (CinepakContext *s)
+{
+    const uint8_t  *eod = (s->data + s->size);
+    int           i, result, strip_size, frame_flags, num_strips;
+    int           y0 = 0;
+
+    frame_flags = s->data[0];
+    num_strips  = AV_RB16 (&s->data[8]);
+
     s->data += 10 + s->sega_film_skip_bytes;
 
     num_strips = FFMIN(num_strips, MAX_STRIPS);
@@ -432,6 +444,7 @@
     const uint8_t *buf = avpkt->data;
     int ret = 0, buf_size = avpkt->size;
     CinepakContext *s = avctx->priv_data;
+    int num_strips;
 
     s->data = buf;
     s->size = buf_size;
@@ -439,6 +452,17 @@
     if (s->size < 10)
         return AVERROR_INVALIDDATA;
 
+    num_strips = AV_RB16 (&s->data[8]);
+
+    //Empty frame, do not waste time
+    if (!num_strips && (!s->palette_video || !av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL)))
+        return buf_size;
+
+    if ((ret = cinepak_predecode_check(s)) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "cinepak_predecode_check failed\n");
+        return ret;
+    }
+
     if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/cscd.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/cscd.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/cuvid.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/cuvid.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/dfa.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/dfa.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/dirac_dwt.h -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/dirac_dwt.h Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/dirac_dwt_template.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/dirac_dwt_template.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/dsicinvideo.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/dsicinvideo.c Changed

@@ -158,6 +158,9 @@
         }
     }
 
+    if (dst_end - dst > dst_size - dst_size/10)
+        return AVERROR_INVALIDDATA;
+
     return 0;
 }
 
@@ -184,6 +187,10 @@
         }
         dst += len;
     }
+
+    if (dst_end - dst > dst_size - dst_size/10)
+        return AVERROR_INVALIDDATA;
+
     return 0;
 }
 
@@ -226,27 +233,35 @@
      * surface.width = surface.pitch */
     switch (bitmap_frame_type) {
     case 9:
-        cin_decode_rle(buf, bitmap_frame_size,
+        res =  cin_decode_rle(buf, bitmap_frame_size,
                        cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+        if (res < 0)
+            return res;
         break;
     case 34:
-        cin_decode_rle(buf, bitmap_frame_size,
+        res =  cin_decode_rle(buf, bitmap_frame_size,
                        cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+        if (res < 0)
+            return res;
         cin_apply_delta_data(cin->bitmap_table[CIN_PRE_BMP],
                              cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
         break;
     case 35:
         bitmap_frame_size = cin_decode_huffman(buf, bitmap_frame_size,
                            cin->bitmap_table[CIN_INT_BMP], cin->bitmap_size);
-        cin_decode_rle(cin->bitmap_table[CIN_INT_BMP], bitmap_frame_size,
+        res =  cin_decode_rle(cin->bitmap_table[CIN_INT_BMP], bitmap_frame_size,
                        cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+        if (res < 0)
+            return res;
         break;
     case 36:
         bitmap_frame_size = cin_decode_huffman(buf, bitmap_frame_size,
                                                cin->bitmap_table[CIN_INT_BMP],
                                                cin->bitmap_size);
-        cin_decode_rle(cin->bitmap_table[CIN_INT_BMP], bitmap_frame_size,
+        res = cin_decode_rle(cin->bitmap_table[CIN_INT_BMP], bitmap_frame_size,
                        cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+        if (res < 0)
+            return res;
         cin_apply_delta_data(cin->bitmap_table[CIN_PRE_BMP],
                              cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
         break;

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/dvdsub_parser.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/dvdsub_parser.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/elsdec.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/elsdec.c Changed

@@ -271,7 +271,7 @@
 
 void ff_els_decoder_uninit(ElsUnsignedRung *rung)
 {
-    av_free(rung->rem_rung_list);
+    av_freep(&rung->rem_rung_list);
 }
 
 static int els_import_byte(ElsDecCtx *ctx)
@@ -391,12 +391,10 @@
                 if (ur->rung_list_size <= (ur->avail_index + 2) * sizeof(ElsRungNode)) {
                     // remember rung_node position
                     ptrdiff_t pos     = rung_node - ur->rem_rung_list;
-                    ur->rem_rung_list = av_realloc(ur->rem_rung_list,
+                    ctx->err = av_reallocp(&ur->rem_rung_list,
                                                    ur->rung_list_size +
                                                    RUNG_SPACE);
-                    if (!ur->rem_rung_list) {
-                        av_free(ur->rem_rung_list);
-                        ctx->err = AVERROR(ENOMEM);
+                    if (ctx->err < 0) {
                         return 0;
                     }
                     memset((uint8_t *) ur->rem_rung_list + ur->rung_list_size, 0,

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/error_resilience.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/error_resilience.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/escape124.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/escape124.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/ffv1enc.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/ffv1enc.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/fic.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/fic.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/flac_parser.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/flac_parser.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/g2meet.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/g2meet.c Changed

@@ -556,8 +556,8 @@
         B     = ((pred >> B_shift) & 0xFF) - TOSIGNED(delta);
     }
 
-    if (R<0 || G<0 || B<0) {
-        av_log(NULL, AV_LOG_ERROR, "RGB %d %d %d is out of range\n", R, G, B);
+    if (R<0 || G<0 || B<0 || R > 255 || G > 255 || B > 255) {
+        avpriv_request_sample(NULL, "RGB %d %d %d is out of range\n", R, G, B);
         return 0;
     }
 
@@ -927,6 +927,7 @@
         if (c->ec.els_ctx.err != 0) {
             av_log(avctx, AV_LOG_ERROR,
                    "ePIC: couldn't decode transparency pixel!\n");
+            ff_els_decoder_uninit(&c->ec.unsigned_rung);
             return AVERROR_INVALIDDATA;
         }
 
@@ -1355,14 +1356,16 @@
     } else {
         dst    +=  x * 3;
     }
-    if (y < 0) {
+
+    if (y < 0)
         h      +=  y;
+    if (w < 0 || h < 0)
+        return;
+    if (y < 0) {
         cursor += -y * c->cursor_stride;
     } else {
         dst    +=  y * stride;
     }
-    if (w < 0 || h < 0)
-        return;
 
     for (j = 0; j < h; j++) {
         for (i = 0; i < w; i++) {

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/g723_1dec.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/g723_1dec.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/h263dec.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/h263dec.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/h264_mc_template.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/h264_mc_template.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/h264_parser.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/h264_parser.c Changed

@@ -121,20 +121,23 @@
             }
             state = 7;
         } else {
+            unsigned int mb, last_mb = p->parse_last_mb;
+            GetBitContext gb;
             p->parse_history[p->parse_history_count++] = buf[i];
-            if (p->parse_history_count > 5) {
-                unsigned int mb, last_mb = p->parse_last_mb;
-                GetBitContext gb;
 
-                init_get_bits(&gb, p->parse_history, 8*p->parse_history_count);
-                p->parse_history_count = 0;
-                mb= get_ue_golomb_long(&gb);
+            init_get_bits(&gb, p->parse_history, 8*p->parse_history_count);
+            mb= get_ue_golomb_long(&gb);
+            if (get_bits_left(&gb) > 0 || p->parse_history_count > 5) {
                 p->parse_last_mb = mb;
                 if (pc->frame_start_found) {
-                    if (mb <= last_mb)
+                    if (mb <= last_mb) {
+                        i -= p->parse_history_count - 1;
+                        p->parse_history_count = 0;
                         goto found;
+                    }
                 } else
                     pc->frame_start_found = 1;
+                p->parse_history_count = 0;
                 state = 7;
             }
         }
@@ -149,7 +152,7 @@
     pc->frame_start_found = 0;
     if (p->is_avc)
         return next_avc;
-    return i - (state & 5) - 5 * (state > 7);
+    return i - (state & 5);
 }
 
 static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb,

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/h264_ps.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/h264_ps.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/h264_ps.h -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/h264_ps.h Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/imgconvert.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/imgconvert.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/indeo4.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/indeo4.c Changed

@@ -260,12 +260,14 @@
  *  @param[in]     avctx     pointer to the AVCodecContext
  *  @return        result code: 0 = OK, negative number = error
  */
-static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band,
+static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *arg_band,
                            AVCodecContext *avctx)
 {
     int plane, band_num, indx, transform_id, scan_indx;
     int i;
     int quant_mat;
+    IVIBandDesc temp_band, *band = &temp_band;
+    memcpy(&temp_band, arg_band, sizeof(temp_band));
 
     plane    = get_bits(&ctx->gb, 2);
     band_num = get_bits(&ctx->gb, 4);
@@ -395,10 +397,10 @@
 
         /* decode block huffman codebook */
         if (!get_bits1(&ctx->gb))
-            band->blk_vlc.tab = ctx->blk_vlc.tab;
+            arg_band->blk_vlc.tab = ctx->blk_vlc.tab;
         else
             if (ff_ivi_dec_huff_desc(&ctx->gb, 1, IVI_BLK_HUFF,
-                                     &band->blk_vlc, avctx))
+                                     &arg_band->blk_vlc, avctx))
                 return AVERROR_INVALIDDATA;
 
         /* select appropriate rvmap table for this band */
@@ -439,6 +441,9 @@
         return AVERROR_INVALIDDATA;
     }
 
+    band->blk_vlc = arg_band->blk_vlc;
+    memcpy(arg_band, band, sizeof(*arg_band));
+
     return 0;
 }
 
@@ -487,6 +492,11 @@
             mb->b_mv_x   =
             mb->b_mv_y   = 0;
 
+            if (get_bits_left(&ctx->gb) < 1) {
+                av_log(avctx, AV_LOG_ERROR, "Insufficient input for mb info\n");
+                return AVERROR_INVALIDDATA;
+            }
+
             if (get_bits1(&ctx->gb)) {
                 if (ctx->frame_type == IVI4_FRAMETYPE_INTRA) {
                     av_log(avctx, AV_LOG_ERROR, "Empty macroblock in an INTRA picture!\n");

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/jpeg2000dec.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/jpeg2000dec.c Changed

@@ -340,7 +340,10 @@
     s->numXtiles = ff_jpeg2000_ceildiv(s->width  - s->tile_offset_x, s->tile_width);
     s->numYtiles = ff_jpeg2000_ceildiv(s->height - s->tile_offset_y, s->tile_height);
 
-    if (s->numXtiles * (uint64_t)s->numYtiles > INT_MAX/sizeof(*s->tile)) {
+    // There must be at least a SOT and SOD per tile, their minimum size is 14
+    if (s->numXtiles * (uint64_t)s->numYtiles > INT_MAX/sizeof(*s->tile) ||
+        s->numXtiles * s->numYtiles * 14LL > bytestream2_size(&s->g)
+    ) {
         s->numXtiles = s->numYtiles = 0;
         return AVERROR(EINVAL);
     }
@@ -1125,6 +1128,9 @@
             step_x = 32;
             step_y = 32;
 
+            if (RSpoc > FFMIN(codsty->nreslevels, REpoc))
+                continue;
+
             for (reslevelno = RSpoc; reslevelno < FFMIN(codsty->nreslevels, REpoc); reslevelno++) {
                 uint8_t reducedresno = codsty->nreslevels - 1 -reslevelno; //  ==> N_L - r
                 Jpeg2000ResLevel *rlevel = comp->reslevel + reslevelno;
@@ -1144,10 +1150,10 @@
                         int xc = x / s->cdx[compno];
                         int yc = y / s->cdy[compno];
 
-                        if (yc % (1 << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check
+                        if (yc % (1LL << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check
                             continue;
 
-                        if (xc % (1 << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check
+                        if (xc % (1LL << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check
                             continue;
 
                         // check if a precinct exists
@@ -1214,10 +1220,10 @@
                         if (reslevelno >= codsty->nreslevels)
                             continue;
 
-                        if (yc % (1 << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check
+                        if (yc % (1LL << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check
                             continue;
 
-                        if (xc % (1 << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check
+                        if (xc % (1LL << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check
                             continue;
 
                         // check if a precinct exists
@@ -1285,10 +1291,10 @@
                         uint8_t reducedresno = codsty->nreslevels - 1 -reslevelno; //  ==> N_L - r
                         Jpeg2000ResLevel *rlevel = comp->reslevel + reslevelno;
 
-                        if (yc % (1 << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check
+                        if (yc % (1LL << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check
                             continue;
 
-                        if (xc % (1 << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check
+                        if (xc % (1LL << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check
                             continue;
 
                         // check if a precinct exists

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/mjpegdec.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/mjpegdec.c Changed

@@ -597,6 +597,10 @@
         avpriv_report_missing_feature(s->avctx, "Lowres for weird subsampling");
         return AVERROR_PATCHWELCOME;
     }
+    if ((AV_RB32(s->upscale_h) || AV_RB32(s->upscale_v)) && s->progressive && s->avctx->pix_fmt == AV_PIX_FMT_GBRP) {
+        avpriv_report_missing_feature(s->avctx, "progressive for weird subsampling");
+        return AVERROR_PATCHWELCOME;
+    }
     if (s->ls) {
         memset(s->upscale_h, 0, sizeof(s->upscale_h));
         memset(s->upscale_v, 0, sizeof(s->upscale_v));
@@ -989,6 +993,11 @@
         for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
             int modified_predictor = predictor;
 
+            if (get_bits_left(&s->gb) < 1) {
+                av_log(s->avctx, AV_LOG_ERROR, "bitstream end in rgb_scan\n");
+                return AVERROR_INVALIDDATA;
+            }
+
             if (s->restart_interval && !s->restart_count){
                 s->restart_count = s->restart_interval;
                 resync_mb_x = mb_x;
@@ -1012,7 +1021,7 @@
                     return -1;
 
                 left[i] = buffer[mb_x][i] =
-                    mask & (pred + (dc * (1 << point_transform)));
+                    mask & (pred + (unsigned)(dc * (1 << point_transform)));
             }
 
             if (s->restart_interval && !--s->restart_count) {

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/mlpdec.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/mlpdec.c Changed

@@ -474,7 +474,7 @@
     uint8_t checksum;
     uint8_t lossless_check;
     int start_count = get_bits_count(gbp);
-    int min_channel, max_channel, max_matrix_channel;
+    int min_channel, max_channel, max_matrix_channel, noise_type;
     const int std_max_matrix_channel = m->avctx->codec_id == AV_CODEC_ID_MLP
                                      ? MAX_MATRIX_CHANNEL_MLP
                                      : MAX_MATRIX_CHANNEL_TRUEHD;
@@ -487,9 +487,9 @@
         return AVERROR_INVALIDDATA;
     }
 
-    s->noise_type = get_bits1(gbp);
+    noise_type = get_bits1(gbp);
 
-    if (m->avctx->codec_id == AV_CODEC_ID_MLP && s->noise_type) {
+    if (m->avctx->codec_id == AV_CODEC_ID_MLP && noise_type) {
         av_log(m->avctx, AV_LOG_ERROR, "MLP must have 0x31ea sync word.\n");
         return AVERROR_INVALIDDATA;
     }
@@ -515,7 +515,7 @@
 
     /* This should happen for TrueHD streams with >6 channels and MLP's noise
      * type. It is not yet known if this is allowed. */
-    if (max_channel > MAX_MATRIX_CHANNEL_MLP && !s->noise_type) {
+    if (max_channel > MAX_MATRIX_CHANNEL_MLP && !noise_type) {
         avpriv_request_sample(m->avctx,
                               "%d channels (more than the "
                               "maximum supported by the decoder)",
@@ -532,6 +532,7 @@
     s->min_channel        = min_channel;
     s->max_channel        = max_channel;
     s->max_matrix_channel = max_matrix_channel;
+    s->noise_type         = noise_type;
 
     if (m->avctx->request_channel_layout && (s->ch_layout & m->avctx->request_channel_layout) ==
         m->avctx->request_channel_layout && m->max_decoded_substream > substr) {

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/mpeg4videoenc.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/mpeg4videoenc.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/opus_silk.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/opus_silk.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/ra144.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/ra144.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/shorten.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/shorten.c Changed

@@ -177,7 +177,7 @@
             buffer[i] = 0;
     } else if (s->bitshift != 0) {
         for (i = 0; i < s->blocksize; i++)
-            buffer[i] <<= s->bitshift;
+            buffer[i] *= 1U << s->bitshift;
     }
 }
 
@@ -234,11 +234,11 @@
 
     while (bytestream2_get_le32(&gb) != MKTAG('C', 'O', 'M', 'M')) {
         len = bytestream2_get_be32(&gb);
-        bytestream2_skip(&gb, len + (len & 1));
-        if (len < 0 || bytestream2_get_bytes_left(&gb) < 18) {
+        if (len < 0 || bytestream2_get_bytes_left(&gb) < 18LL + len + (len&1)) {
             av_log(avctx, AV_LOG_ERROR, "no COMM chunk found\n");
             return AVERROR_INVALIDDATA;
         }
+        bytestream2_skip(&gb, len + (len & 1));
     }
     len = bytestream2_get_be32(&gb);
 
@@ -389,7 +389,7 @@
     for (i = 0; i < s->blocksize; i++) {
         sum = init_sum;
         for (j = 0; j < pred_order; j++)
-            sum += coeffs[j] * s->decoded[channel][i - j - 1];
+            sum += coeffs[j] * (unsigned)s->decoded[channel][i - j - 1];
         s->decoded[channel][i] = get_sr_golomb_shorten(&s->gb, residual_size) +
                                  (sum >> qshift);
     }
@@ -450,6 +450,10 @@
             return AVERROR_INVALIDDATA;
         }
         s->nmean = get_uint(s, 0);
+        if (s->nmean > 32768U) {
+            av_log(s->avctx, AV_LOG_ERROR, "nmean is: %d\n", s->nmean);
+            return AVERROR_INVALIDDATA;
+        }
 
         skip_bytes = get_uint(s, NSKIPSIZE);
         if ((unsigned)skip_bytes > get_bits_left(&s->gb)/8) {
@@ -674,7 +678,7 @@
             else {
                 int32_t sum = (s->version < 2) ? 0 : s->nmean / 2;
                 for (i = 0; i < s->nmean; i++)
-                    sum += s->offset[channel][i];
+                    sum += (unsigned)s->offset[channel][i];
                 coffset = sum / s->nmean;
                 if (s->version >= 2)
                     coffset = s->bitshift == 0 ? coffset : coffset >> s->bitshift - 1 >> 1;
@@ -692,7 +696,7 @@
 
             /* update means with info from the current block */
             if (s->nmean > 0) {
-                int32_t sum = (s->version < 2) ? 0 : s->blocksize / 2;
+                int64_t sum = (s->version < 2) ? 0 : s->blocksize / 2;
                 for (i = 0; i < s->blocksize; i++)
                     sum += s->decoded[channel][i];
 
@@ -702,7 +706,7 @@
                 if (s->version < 2)
                     s->offset[channel][s->nmean - 1] = sum / s->blocksize;
                 else
-                    s->offset[channel][s->nmean - 1] = s->bitshift == 32 ? 0 : (sum / s->blocksize) << s->bitshift;
+                    s->offset[channel][s->nmean - 1] = s->bitshift == 32 ? 0 : (sum / s->blocksize) * (1 << s->bitshift);
             }
 
             /* copy wrap samples for use with next block */

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/truemotion2.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/truemotion2.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/vc1_block.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/vc1_block.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/vp8_parser.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/vp8_parser.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/wavpack.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/wavpack.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/wavpack.h -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/wavpack.h Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavcodec/xwddec.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavcodec/xwddec.c Changed

@@ -39,6 +39,7 @@
     uint32_t pixformat, pixdepth, bunit, bitorder, bpad;
     uint32_t rgb[3];
     uint8_t *ptr;
+    int width, height;
     GetByteContext gb;
 
     if (buf_size < XWD_HEADER_SIZE)
@@ -60,8 +61,8 @@
 
     pixformat     = bytestream2_get_be32u(&gb);
     pixdepth      = bytestream2_get_be32u(&gb);
-    avctx->width  = bytestream2_get_be32u(&gb);
-    avctx->height = bytestream2_get_be32u(&gb);
+    width         = bytestream2_get_be32u(&gb);
+    height        = bytestream2_get_be32u(&gb);
     xoffset       = bytestream2_get_be32u(&gb);
     be            = bytestream2_get_be32u(&gb);
     bunit         = bytestream2_get_be32u(&gb);
@@ -77,6 +78,9 @@
     ncolors       = bytestream2_get_be32u(&gb);
     bytestream2_skipu(&gb, header_size - (XWD_HEADER_SIZE - 20));
 
+    if ((ret = ff_set_dimensions(avctx, width, height)) < 0)
+        return ret;
+
     av_log(avctx, AV_LOG_DEBUG,
            "pixformat %"PRIu32", pixdepth %"PRIu32", bunit %"PRIu32", bitorder %"PRIu32", bpad %"PRIu32"\n",
            pixformat, pixdepth, bunit, bitorder, bpad);

omxplayer-2018.03.13.tar.gz/ffmpeg/libavformat/http.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavformat/http.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavformat/mms.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavformat/mms.c Changed

@@ -94,24 +94,26 @@
                 }
             }
         } else if (!memcmp(p, ff_asf_stream_header, sizeof(ff_asf_guid))) {
-            flags     = AV_RL16(p + sizeof(ff_asf_guid)*3 + 24);
-            stream_id = flags & 0x7F;
-            //The second condition is for checking CS_PKT_STREAM_ID_REQUEST packet size,
-            //we can calculate the packet size by stream_num.
-            //Please see function send_stream_selection_request().
-            if (mms->stream_num < MMS_MAX_STREAMS &&
-                    46 + mms->stream_num * 6 < sizeof(mms->out_buffer)) {
-                mms->streams = av_fast_realloc(mms->streams,
-                                   &mms->nb_streams_allocated,
-                                   (mms->stream_num + 1) * sizeof(MMSStream));
-                if (!mms->streams)
-                    return AVERROR(ENOMEM);
-                mms->streams[mms->stream_num].id = stream_id;
-                mms->stream_num++;
-            } else {
-                av_log(NULL, AV_LOG_ERROR,
-                       "Corrupt stream (too many A/V streams)\n");
-                return AVERROR_INVALIDDATA;
+            if (end - p >= (sizeof(ff_asf_guid) * 3 + 26)) {
+                flags     = AV_RL16(p + sizeof(ff_asf_guid)*3 + 24);
+                stream_id = flags & 0x7F;
+                //The second condition is for checking CS_PKT_STREAM_ID_REQUEST packet size,
+                //we can calculate the packet size by stream_num.
+                //Please see function send_stream_selection_request().
+                if (mms->stream_num < MMS_MAX_STREAMS &&
+                        46 + mms->stream_num * 6 < sizeof(mms->out_buffer)) {
+                    mms->streams = av_fast_realloc(mms->streams,
+                                       &mms->nb_streams_allocated,
+                                       (mms->stream_num + 1) * sizeof(MMSStream));
+                    if (!mms->streams)
+                        return AVERROR(ENOMEM);
+                    mms->streams[mms->stream_num].id = stream_id;
+                    mms->stream_num++;
+                } else {
+                    av_log(NULL, AV_LOG_ERROR,
+                           "Corrupt stream (too many A/V streams)\n");
+                    return AVERROR_INVALIDDATA;
+                }
             }
         } else if (!memcmp(p, ff_asf_ext_stream_header, sizeof(ff_asf_guid))) {
             if (end - p >= 88) {
@@ -143,6 +145,12 @@
             }
         } else if (!memcmp(p, ff_asf_head1_guid, sizeof(ff_asf_guid))) {
             chunksize = 46; // see references [2] section 3.4. This should be set 46.
+            if (chunksize > end - p) {
+                av_log(NULL, AV_LOG_ERROR,
+                    "Corrupt stream (header chunksize %"PRId64" is invalid)\n",
+                    chunksize);
+                return AVERROR_INVALIDDATA;
+            }
         }
         p += chunksize;
     }

omxplayer-2018.03.13.tar.gz/ffmpeg/libavformat/mov.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavformat/mov.c Changed

@@ -2440,14 +2440,22 @@
 
     sc->stsc_count = i;
     for (i = sc->stsc_count - 1; i < UINT_MAX; i--) {
+        int64_t first_min = i + 1;
         if ((i+1 < sc->stsc_count && sc->stsc_data[i].first >= sc->stsc_data[i+1].first) ||
             (i > 0 && sc->stsc_data[i].first <= sc->stsc_data[i-1].first) ||
-            sc->stsc_data[i].first < 1 ||
+            sc->stsc_data[i].first < first_min ||
             sc->stsc_data[i].count < 1 ||
             sc->stsc_data[i].id < 1) {
             av_log(c->fc, AV_LOG_WARNING, "STSC entry %d is invalid (first=%d count=%d id=%d)\n", i, sc->stsc_data[i].first, sc->stsc_data[i].count, sc->stsc_data[i].id);
-            if (i+1 >= sc->stsc_count || sc->stsc_data[i+1].first < 2)
-                return AVERROR_INVALIDDATA;
+            if (i+1 >= sc->stsc_count) {
+                sc->stsc_data[i].first = FFMAX(sc->stsc_data[i].first, first_min);
+                if (i > 0 && sc->stsc_data[i].first <= sc->stsc_data[i-1].first)
+                    sc->stsc_data[i].first = FFMIN(sc->stsc_data[i-1].first + 1LL, INT_MAX);
+                sc->stsc_data[i].count = FFMAX(sc->stsc_data[i].count, 1);
+                sc->stsc_data[i].id    = FFMAX(sc->stsc_data[i].id, 1);
+                continue;
+            }
+            av_assert0(sc->stsc_data[i+1].first >= 2);
             // We replace this entry by the next valid
             sc->stsc_data[i].first = sc->stsc_data[i+1].first - 1;
             sc->stsc_data[i].count = sc->stsc_data[i+1].count;
@@ -3516,6 +3524,9 @@
     } else {
         unsigned chunk_samples, total = 0;
 
+        if (!sc->chunk_count)
+            return;
+
         // compute total chunk count
         for (i = 0; i < sc->stsc_count; i++) {
             unsigned count, chunk_count;
@@ -3758,7 +3769,7 @@
                st->index);
         return 0;
     }
-    if (sc->stsc_count && sc->stsc_data[ sc->stsc_count - 1 ].first > sc->chunk_count) {
+    if (sc->chunk_count && sc->stsc_count && sc->stsc_data[ sc->stsc_count - 1 ].first > sc->chunk_count) {
         av_log(c->fc, AV_LOG_ERROR, "stream %d, contradictionary STSC and STCO\n",
                st->index);
         return AVERROR_INVALIDDATA;
@@ -6373,7 +6384,9 @@
     } else {
         int64_t next_dts = (sc->current_sample < st->nb_index_entries) ?
             st->index_entries[sc->current_sample].timestamp : st->duration;
-        pkt->duration = next_dts - pkt->dts;
+
+        if (next_dts >= pkt->dts)
+            pkt->duration = next_dts - pkt->dts;
         pkt->pts = pkt->dts;
     }
     if (st->discard == AVDISCARD_ALL)

omxplayer-2018.03.13.tar.gz/ffmpeg/libavformat/movenc.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavformat/movenc.c Changed

@@ -378,13 +378,18 @@
 
             if (hdr->substreamid == info->num_ind_sub + 1) {
                 //info->num_ind_sub++;
-                avpriv_request_sample(track->par, "Multiple independent substreams");
+                avpriv_request_sample(mov->fc, "Multiple independent substreams");
                 return AVERROR_PATCHWELCOME;
             } else if (hdr->substreamid < info->num_ind_sub ||
                        hdr->substreamid == 0 && info->substream[0].bsid) {
                 info->ec3_done = 1;
                 goto concatenate;
             }
+        } else {
+            if (hdr->substreamid != 0) {
+                avpriv_request_sample(mov->fc, "Multiple non EAC3 independent substreams");
+                return AVERROR_PATCHWELCOME;
+            }
         }
 
         /* fill the info needed for the "dec3" atom */
@@ -932,7 +937,7 @@
     uint32_t tag = track->tag;
 
     if (track->mode == MODE_MOV) {
-        if (track->timescale > UINT16_MAX) {
+        if (track->timescale > UINT16_MAX || !track->par->channels) {
             if (mov_get_lpcm_flags(track->par->codec_id))
                 tag = AV_RL32("lpcm");
             version = 2;
@@ -4950,6 +4955,11 @@
     else
         samples_in_chunk = 1;
 
+    if (samples_in_chunk < 1) {
+        av_log(s, AV_LOG_ERROR, "fatal error, input packet contains no samples\n");
+        return AVERROR_PATCHWELCOME;
+    }
+
     /* copy extradata if it exists */
     if (trk->vos_len == 0 && par->extradata_size > 0 &&
         !TAG_IS_AVCI(trk->tag) &&

omxplayer-2018.03.13.tar.gz/ffmpeg/libavformat/pva.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavformat/pva.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavformat/rmdec.c -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavformat/rmdec.c Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libavutil/common.h -> omxplayer-2018.09.04.tar.gz/ffmpeg/libavutil/common.h Changed

omxplayer-2018.03.13.tar.gz/ffmpeg/libswresample/arm/audio_convert_neon.S -> omxplayer-2018.09.04.tar.gz/ffmpeg/libswresample/arm/audio_convert_neon.S Changed

omxplayer-2018.03.13.tar.gz/omxplayer.1 -> omxplayer-2018.09.04.tar.gz/omxplayer.1 Changed

@@ -0,0 +1,199 @@
+.\" Generated with Ronnjs 0.3.8
+.\" http://github.com/kapouer/ronnjs/
+.
+.TH "OMXPLAYER" "1" "October 2018" "" ""
+.
+.SH "NAME"
+\fBomxplayer\fR \-\- Raspberry Pi command line OMX playerOMXPlayer is a commandline OMX player for the Raspberry Pi\. It was developed as
+a testbed for the XBMC Raspberry PI implementation and is quite handy to use
+standalone\. 
+.
+.SH "SYNOPSIS"
+Usage: omxplayer [OPTIONS] [FILE]
+.
+.IP "" 4
+.
+.nf
+\-h  \-\-help                  Print this help
+\-v  \-\-version               Print version info
+\-k  \-\-keys                  Print key bindings
+\-n  \-\-aidx  index           Audio stream index    : e\.g\. 1
+\-o  \-\-adev  device          Audio out device      : e\.g\. hdmi/local/both/alsa[:device]
+\-i  \-\-info                  Dump stream format and exit
+\-I  \-\-with\-info             dump stream format before playback
+\-s  \-\-stats                 Pts and buffer stats
+\-p  \-\-passthrough           Audio passthrough
+\-d  \-\-deinterlace           Force deinterlacing
+    \-\-nodeinterlace         Force no deinterlacing
+    \-\-nativedeinterlace     let display handle interlace
+    \-\-anaglyph type         convert 3d to anaglyph
+    \-\-advanced[=0]          Enable/disable advanced deinterlace for HD videos (default enabled)
+\-w  \-\-hw                    Hw audio decoding
+\-3  \-\-3d mode               Switch tv into 3d mode (e\.g\. SBS/TB)
+\-M  \-\-allow\-mvc             Allow decoding of both views of MVC stereo stream
+\-y  \-\-hdmiclocksync         Display refresh rate to match video (default)
+\-z  \-\-nohdmiclocksync       Do not adjust display refresh rate to match video
+\-t  \-\-sid index             Show subtitle with index
+\-r  \-\-refresh               Adjust framerate/resolution to video
+\-g  \-\-genlog                Generate log file
+\-l  \-\-pos n                 Start position (hh:mm:ss)
+\-b  \-\-blank[=0xAARRGGBB]    Set the video background color to black (or optional ARGB value)
+    \-\-loop                  Loop file\. Ignored if file not seekable
+    \-\-no\-boost\-on\-downmix   Don\'t boost volume when downmixing
+    \-\-vol n                 set initial volume in millibels (default 0)
+    \-\-amp n                 set initial amplification in millibels (default 0)
+    \-\-no\-osd                Do not display status information on screen
+    \-\-no\-keys               Disable keyboard input (prevents hangs for certain TTYs)
+    \-\-subtitles path        External subtitles in UTF\-8 srt format
+    \-\-font path             Default: /usr/share/fonts/truetype/freefont/FreeSans\.ttf
+    \-\-italic\-font path      Default: /usr/share/fonts/truetype/freefont/FreeSansOblique\.ttf
+    \-\-font\-size size        Font size in 1/1000 screen height (default: 55)
+    \-\-align left/center     Subtitle alignment (default: left)
+    \-\-no\-ghost\-box          No semitransparent boxes behind subtitles
+    \-\-lines n               Number of lines in the subtitle buffer (default: 3)
+    \-\-win \'x1 y1 x2 y2\'     Set position of video window
+    \-\-win x1,y1,x2,y2       Set position of video window
+    \-\-crop \'x1 y1 x2 y2\'    Set crop area for input video
+    \-\-crop x1,y1,x2,y2      Set crop area for input video
+    \-\-aspect\-mode type      Letterbox, fill, stretch\. Default: stretch if win is specified, letterbox otherwise
+    \-\-audio_fifo  n         Size of audio output fifo in seconds
+    \-\-video_fifo  n         Size of video output fifo in MB
+    \-\-audio_queue n         Size of audio input queue in MB
+    \-\-video_queue n         Size of video input queue in MB
+    \-\-threshold   n         Amount of buffered data required to finish buffering [s]
+    \-\-timeout     n         Timeout for stalled file/network operations (default 10s)
+    \-\-orientation n         Set orientation of video (0, 90, 180 or 270)
+    \-\-fps n                 Set fps of video where timestamps are not present
+    \-\-live                  Set for live tv or vod type stream
+    \-\-layout                Set output speaker layout (e\.g\. 5\.1)
+    \-\-dbus_name name        default: org\.mpris\.MediaPlayer2\.omxplayer
+    \-\-key\-config <file>     Uses key bindings in <file> instead of the default
+    \-\-alpha                 Set video transparency (0\.\.255)
+    \-\-layer n               Set video render layer number (higher numbers are on top)
+    \-\-display n             Set display to output to
+    \-\-cookie \'cookie\'       Send specified cookie as part of HTTP requests
+    \-\-user\-agent \'ua\'       Send specified User\-Agent as part of HTTP requests
+    \-\-lavfdopts \'opts\'      Options passed to libavformat, e\.g\. \'probesize:250000,\.\.\.\'
+    \-\-avdict \'opts\'         Options passed to demuxer, e\.g\., \'rtsp_transport:tcp,\.\.\.\'
+.
+.fi
+.
+.IP "" 0
+.
+.P
+For example:
+.
+.IP "" 4
+.
+.nf
+\|\./omxplayer \-p \-o hdmi test\.mkv
+.
+.fi
+.
+.IP "" 0
+.
+.SH "KEY BINDINGS"
+Key bindings to control omxplayer while playing:
+.
+.IP "" 4
+.
+.nf
+1           decrease speed
+2           increase speed
+<           rewind
+>           fast forward
+z           show info
+j           previous audio stream
+k           next audio stream
+i           previous chapter
+o           next chapter
+n           previous subtitle stream
+m           next subtitle stream
+s           toggle subtitles
+w           show subtitles
+x           hide subtitles
+d           decrease subtitle delay (\- 250 ms)
+f           increase subtitle delay (+ 250 ms)
+q           exit omxplayer
+p / space   pause/resume
+\-           decrease volume
++ / =       increase volume
+left arrow  seek \-30 seconds
+right arrow seek +30 seconds
+down arrow  seek \-600 seconds
+up arrow    seek +600 seconds
+.
+.fi
+.
+.IP "" 0
+.
+.SH "KEY CONFIG SYNTAX"
+A key config file is a series of rules of the form [action]:[key]\. Multiple keys can be bound
+to the same action, and comments are supported by adding a # in front of the line\.
+The list of valid [action]s roughly corresponds to the list of default key bindings above and are:
+.
+.IP "" 4
+.
+.nf
+DECREASE_SPEED
+INCREASE_SPEED
+REWIND
+FAST_FORWARD
+SHOW_INFO
+PREVIOUS_AUDIO
+NEXT_AUDIO
+PREVIOUS_CHAPTER
+NEXT_CHAPTER
+PREVIOUS_SUBTITLE
+NEXT_SUBTITLE
+TOGGLE_SUBTITLE
+DECREASE_SUBTITLE_DELAY
+INCREASE_SUBTITLE_DELAY
+EXIT
+PAUSE
+DECREASE_VOLUME
+INCREASE_VOLUME
+SEEK_BACK_SMALL
+SEEK_FORWARD_SMALL
+SEEK_BACK_LARGE
+SEEK_FORWARD_LARGE
+STEP
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Valid [key]s include all alpha\-numeric characters and most symbols, as well as:
+.
+.IP "" 4
+.
+.nf
+left
+right
+up
+down
+esc
+hex [keycode]
+.
+.fi
+.
+.IP "" 0
+.
+.P
+For example:
+.
+.IP "" 4
+.
+.nf
+EXIT:esc
+PAUSE:p
+#Note that this next line has a space after the :
+PAUSE: 
+REWIND:left
+SEEK_FORWARD_SMALL:hex 0x4f43
+EXIT:q
+.
+.fi
+.
+.IP "" 0

omxplayer-2018.03.13.tar.gz/omxplayer.cpp -> omxplayer-2018.09.04.tar.gz/omxplayer.cpp Changed

@@ -1024,6 +1024,8 @@
     m_keyboard->setDbusName(m_dbus_name);
   }
 
+  change_file:
+
   if(!m_omx_reader.Open(m_filename.c_str(), m_dump_format, m_config_audio.is_live, m_timeout, m_cookie.c_str(), m_user_agent.c_str(), m_lavfdopts.c_str(), m_avdict.c_str()))
     goto do_exit;
 
@@ -1200,6 +1202,15 @@
 
     switch(result.getKey())
     {
+     case KeyConfig::ACTION_CHANGE_FILE:
+        FlushStreams(DVD_NOPTS_VALUE);
+        m_omx_reader.Close();
+        m_player_subtitles.Close();
+        m_player_video.Close();
+        m_player_audio.Close();
+        m_filename = result.getWinArg();
+        goto change_file;
+        break;
       case KeyConfig::ACTION_SHOW_INFO:
         m_tv_show_info = !m_tv_show_info;
         vc_tv_show_info(m_tv_show_info);
@@ -1433,6 +1444,9 @@
       case KeyConfig::ACTION_SET_ALPHA:
           m_player_video.SetAlpha(result.getArg());
           break;
+      case KeyConfig::ACTION_SET_LAYER:
+          m_player_video.SetLayer(result.getArg());
+          break;
       case KeyConfig::ACTION_PLAY:
         m_Pause=false;
         if(m_has_subtitle)

Overview

Request 4301 (accepted)

Request History