Packman Build Service PMBS

omxplayer.changes Changed

omxplayer.spec Changed

Makefile.include.diff Changed

@@ -1,6 +1,8 @@
---- Makefile.include.orig	2013-09-13 12:23:24.550816391 +0200
-+++ Makefile.include	2013-09-13 12:24:01.550951773 +0200
-@@ -9,13 +9,13 @@ TOOLCHAIN	:=$(BUILDROOT)/output/host/usr
+diff --git a/Makefile.include b/Makefile.include
+index 58e9560..8bf1fa9 100644
+--- a/Makefile.include
++++ b/Makefile.include
+@@ -9,32 +9,32 @@ TOOLCHAIN	:=$(BUILDROOT)/output/host/usr/
  HOST			:=arm-unknown-linux-gnueabi
  SYSROOT		:=$(BUILDROOT)/output/host/usr/arm-unknown-linux-gnueabi/sysroot
  else
@@ -20,7 +22,9 @@
  endif
  
  JOBS=7
-@@ -24,15 +24,15 @@ CFLAGS			:= -isystem$(PREFIX)/include
+ 
+-CFLAGS			:= -isystem$(PREFIX)/include
++CFLAGS			:= 
  CXXFLAGS		:= $(CFLAGS)
  CPPFLAGS		:= $(CFLAGS)
  LDFLAGS			:= -L$(BUILDROOT)/lib
@@ -44,3 +48,6 @@
  
  CFLAGS			+= -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog
  LDFLAGS			+= -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build
+ #INCLUDES		+= -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2
+-INCLUDES		+= -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include
++#INCLUDES		+= -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include

omxplayer-2016.06.26.tar.gz/ffmpeg/.git/objects/pack/pack-2e5c6753c22b6b65da800d195db55cf9d48b3511.idx Deleted

omxplayer-2016.06.26.tar.gz/ffmpeg/.git/objects/pack/pack-2e5c6753c22b6b65da800d195db55cf9d48b3511.pack Deleted

omxplayer-2016.06.26.tar.gz/MAN -> omxplayer-2016.08.03.tar.gz/MAN Changed

omxplayer-2016.06.26.tar.gz/Makefile -> omxplayer-2016.08.03.tar.gz/Makefile Changed

@@ -2,13 +2,14 @@
 
 CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
 
-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
+LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
 
 INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
 
 DIST ?= omxplayer-dist
 
-SRC=linux/XMemUtils.cpp \
+SRC=		linux/XMemUtils.cpp \
+		linux/OMXAlsa.cpp \
 		utils/log.cpp \
 		DynamicDll.cpp \
 		utils/PCMRemap.cpp \

omxplayer-2016.06.26.tar.gz/OMXAudio.cpp -> omxplayer-2016.08.03.tar.gz/OMXAudio.cpp Changed

omxplayer-2016.06.26.tar.gz/OMXAudio.h -> omxplayer-2016.08.03.tar.gz/OMXAudio.h Changed

omxplayer-2016.06.26.tar.gz/OMXCore.cpp -> omxplayer-2016.08.03.tar.gz/OMXCore.cpp Changed

@@ -35,6 +35,7 @@
 
 #ifdef TARGET_LINUX
 #include "XMemUtils.h"
+#include "OMXAlsa.h"
 #endif
 
 //#define OMX_DEBUG_EVENTS
@@ -1429,6 +1430,11 @@
   // Get video component handle setting up callbacks, component is in loaded state on return.
   if(!m_handle)
   {
+#ifdef TARGET_LINUX
+    if (strncmp("OMX.alsa.", component_name.c_str(), 9) == 0)
+      omx_err = OMXALSA_GetHandle(&m_handle, (char*) component_name.c_str(), this, &m_callbacks);
+    else
+#endif
     omx_err = m_DllOMX->OMX_GetHandle(&m_handle, (char*)component_name.c_str(), this, &m_callbacks);
     if (!m_handle || omx_err != OMX_ErrorNone)
     {
@@ -1505,6 +1511,11 @@
 
     CLog::Log(LOGDEBUG, "COMXCoreComponent::Deinitialize : %s handle %p\n",
         m_componentName.c_str(), m_handle);
+#ifdef TARGET_LINUX
+    if (strncmp("OMX.alsa.", m_componentName.c_str(), 9) == 0)
+      omx_err = OMXALSA_FreeHandle(m_handle);
+    else
+#endif
     omx_err = m_DllOMX->OMX_FreeHandle(m_handle);
     if (omx_err != OMX_ErrorNone)
     {

omxplayer-2016.06.26.tar.gz/README.md -> omxplayer-2016.08.03.tar.gz/README.md Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/.git/index -> omxplayer-2016.08.03.tar.gz/ffmpeg/.git/index Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/.git/logs/HEAD -> omxplayer-2016.08.03.tar.gz/ffmpeg/.git/logs/HEAD Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/.git/logs/refs/heads/release/3.1 -> omxplayer-2016.08.03.tar.gz/ffmpeg/.git/logs/refs/heads/release/3.1 Changed

omxplayer-2016.08.03.tar.gz/ffmpeg/.git/objects/pack/pack-97c075a92219961c32fe766007efbad10e08b65a.idx Added

omxplayer-2016.08.03.tar.gz/ffmpeg/.git/objects/pack/pack-97c075a92219961c32fe766007efbad10e08b65a.pack Added

omxplayer-2016.06.26.tar.gz/ffmpeg/.git/packed-refs -> omxplayer-2016.08.03.tar.gz/ffmpeg/.git/packed-refs Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/.git/refs/heads/release/3.1 -> omxplayer-2016.08.03.tar.gz/ffmpeg/.git/refs/heads/release/3.1 Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/.git/shallow -> omxplayer-2016.08.03.tar.gz/ffmpeg/.git/shallow Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/Changelog -> omxplayer-2016.08.03.tar.gz/ffmpeg/Changelog Changed

@@ -4,6 +4,60 @@
 version <next>:
 
 
+version 3.1.3:
+- examples/demuxing_decoding: convert to codecpar
+- avcodec/exr: Check tile positions
+- avcodec/aacenc: Tighter input checks
+- avformat/wtvdec: Check pointer before use
+- libavcodec/wmalosslessdec: Check the remaining bits
+- avcodec/adpcm: Fix adpcm_ima_wav padding
+- avcodec/svq3: fix slice size check
+- avcodec/diracdec: Check numx/y
+- avcodec/h2645_parse: fix nal size
+- avcodec/h2645_parse: Use get_nalsize() in ff_h2645_packet_split()
+- h2645_parse: only read avc length code at the correct position
+- h2645_parse: don't overread AnnexB NALs within an avc stream
+- avcodec/h264_parser: Factor get_avc_nalsize() out
+- avcodec/cfhd: Increase minimum band dimension to 3
+- avcodec/indeo2: check ctab
+- avformat/swfdec: Fix inflate() error code check
+- avcodec/rawdec: Fix bits_per_coded_sample checks
+- vcodec/h2645_parse: Clear buffer padding
+- avcodec/h2645: Fix NAL unit padding
+- avfilter/drawutils: Fix single plane with alpha
+- cmdutils: check for SetDllDirectory() availability
+
+version 3.1.2:
+- cmdutils: remove the current working directory from the DLL search path on win32
+- avcodec/rawdec: Fix palette handling with changing palettes
+- avcodec/raw: Fix decoding of ilacetest.mov
+- avformat/mov: Enable mp3 parsing if a packet needs it
+- avformat/hls: Use an array instead of stream offset for stream mapping
+- avformat/hls: Sync starting segment across variants on live streams
+- avformat/hls: Fix regression with ranged media segments
+- avcodec/ffv1enc: Fix assertion failure with non zero bits per sample
+- avfilter/af_hdcd: small fix in af_hdcd.c where gain was not being adjusted for "attenuate slowly"
+- avformat/oggdec: Fix integer overflow with invalid pts
+- ffplay: Fix invalid array index
+- avcodec/alacenc: allocate bigger packets (cherry picked from commit 82b84c71b009884c8d041361027718b19922c76d)
+- libavcodec/dnxhd: Enable 12-bit DNxHR support.
+- lavc/vaapi_encode_h26x: Fix a crash if "." is not the decimal separator.
+- jni: Return ENOSYS on unsupported platforms
+- lavu/hwcontext_vaapi: Fix compilation if VA_FOURCC_ABGR is not defined.
+- avcodec/vp9_parser: Check the input frame sizes for being consistent
+- avformat/flvdec: parse keyframe before a\v stream was created add_keyframes_index() when stream created or keyframe parsed
+- avformat/flvdec: splitting add_keyframes_index() out from parse_keyframes_index()
+- libavformat/rtpdec_asf: zero initialize the AVIOContext struct
+- libavutil/opt: Small bugfix in example.
+- libx264: Increase x264 opts character limit to 4096
+- avcodec/h264_parser: Set sps/pps_ref
+- librtmp: Avoid an infiniloop setting connection arguments
+- avformat/oggparsevp8: fix pts calculation on pages ending with an invisible frame
+- lavc/Makefile: Fix standalone compilation of the svq3 decoder.
+- lavf/vplayerdec: Improve auto-detection.
+- lavc/mediacodecdec_h264: properly convert extradata to annex-b
+- Revert "configure: Enable GCC vectorization on ≥4.9 on x86"
+
 version 3.1.1:
 - doc/APIchanges: document the lavu/lavf field moves
 - avformat/avformat: Move new field to the end of AVStream

omxplayer-2016.06.26.tar.gz/ffmpeg/RELEASE -> omxplayer-2016.08.03.tar.gz/ffmpeg/RELEASE Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/cmdutils.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/cmdutils.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/cmdutils.h -> omxplayer-2016.08.03.tar.gz/ffmpeg/cmdutils.h Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/configure -> omxplayer-2016.08.03.tar.gz/ffmpeg/configure Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/doc/Doxyfile -> omxplayer-2016.08.03.tar.gz/ffmpeg/doc/Doxyfile Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/doc/examples/demuxing_decoding.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/doc/examples/demuxing_decoding.c Changed

@@ -148,11 +148,10 @@
 }
 
 static int open_codec_context(int *stream_idx,
-                              AVFormatContext *fmt_ctx, enum AVMediaType type)
+                              AVCodecContext **dec_ctx, AVFormatContext *fmt_ctx, enum AVMediaType type)
 {
     int ret, stream_index;
     AVStream *st;
-    AVCodecContext *dec_ctx = NULL;
     AVCodec *dec = NULL;
     AVDictionary *opts = NULL;
 
@@ -166,17 +165,31 @@
         st = fmt_ctx->streams[stream_index];
 
         /* find decoder for the stream */
-        dec_ctx = st->codec;
-        dec = avcodec_find_decoder(dec_ctx->codec_id);
+        dec = avcodec_find_decoder(st->codecpar->codec_id);
         if (!dec) {
             fprintf(stderr, "Failed to find %s codec\n",
                     av_get_media_type_string(type));
             return AVERROR(EINVAL);
         }
 
+        /* Allocate a codec context for the decoder */
+        *dec_ctx = avcodec_alloc_context3(dec);
+        if (!*dec_ctx) {
+            fprintf(stderr, "Failed to allocate the %s codec context\n",
+                    av_get_media_type_string(type));
+            return AVERROR(ENOMEM);
+        }
+
+        /* Copy codec parameters from input stream to output codec context */
+        if ((ret = avcodec_parameters_to_context(*dec_ctx, st->codecpar)) < 0) {
+            fprintf(stderr, "Failed to copy %s codec parameters to decoder context\n",
+                    av_get_media_type_string(type));
+            return ret;
+        }
+
         /* Init the decoders, with or without reference counting */
         av_dict_set(&opts, "refcounted_frames", refcount ? "1" : "0", 0);
-        if ((ret = avcodec_open2(dec_ctx, dec, &opts)) < 0) {
+        if ((ret = avcodec_open2(*dec_ctx, dec, &opts)) < 0) {
             fprintf(stderr, "Failed to open %s codec\n",
                     av_get_media_type_string(type));
             return ret;
@@ -255,9 +268,8 @@
         exit(1);
     }
 
-    if (open_codec_context(&video_stream_idx, fmt_ctx, AVMEDIA_TYPE_VIDEO) >= 0) {
+    if (open_codec_context(&video_stream_idx, &video_dec_ctx, fmt_ctx, AVMEDIA_TYPE_VIDEO) >= 0) {
         video_stream = fmt_ctx->streams[video_stream_idx];
-        video_dec_ctx = video_stream->codec;
 
         video_dst_file = fopen(video_dst_filename, "wb");
         if (!video_dst_file) {
@@ -279,9 +291,8 @@
         video_dst_bufsize = ret;
     }
 
-    if (open_codec_context(&audio_stream_idx, fmt_ctx, AVMEDIA_TYPE_AUDIO) >= 0) {
+    if (open_codec_context(&audio_stream_idx, &audio_dec_ctx, fmt_ctx, AVMEDIA_TYPE_AUDIO) >= 0) {
         audio_stream = fmt_ctx->streams[audio_stream_idx];
-        audio_dec_ctx = audio_stream->codec;
         audio_dst_file = fopen(audio_dst_filename, "wb");
         if (!audio_dst_file) {
             fprintf(stderr, "Could not open destination file %s\n", audio_dst_filename);
@@ -369,8 +380,8 @@
     }
 
 end:
-    avcodec_close(video_dec_ctx);
-    avcodec_close(audio_dec_ctx);
+    avcodec_free_context(&video_dec_ctx);
+    avcodec_free_context(&audio_dec_ctx);
     avformat_close_input(&fmt_ctx);
     if (video_dst_file)
         fclose(video_dst_file);

omxplayer-2016.06.26.tar.gz/ffmpeg/ffmpeg.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/ffmpeg.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/ffplay.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/ffplay.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/ffprobe.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/ffprobe.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/ffserver.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/ffserver.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/Makefile -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/Makefile Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/aacenc.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/aacenc.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/adpcm.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/adpcm.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/alacenc.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/alacenc.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/cfhd.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/cfhd.c Changed

@@ -320,7 +320,7 @@
             s->plane[s->channel_num].band[0][0].width  = data;
             s->plane[s->channel_num].band[0][0].stride = data;
             av_log(avctx, AV_LOG_DEBUG, "Lowpass width %"PRIu16"\n", data);
-            if (data < 2 || data > s->plane[s->channel_num].band[0][0].a_width) {
+            if (data < 3 || data > s->plane[s->channel_num].band[0][0].a_width) {
                 av_log(avctx, AV_LOG_ERROR, "Invalid lowpass width\n");
                 ret = AVERROR(EINVAL);
                 break;
@@ -328,7 +328,7 @@
         } else if (tag == 28) {
             s->plane[s->channel_num].band[0][0].height = data;
             av_log(avctx, AV_LOG_DEBUG, "Lowpass height %"PRIu16"\n", data);
-            if (data < 2 || data > s->plane[s->channel_num].band[0][0].height) {
+            if (data < 3 || data > s->plane[s->channel_num].band[0][0].height) {
                 av_log(avctx, AV_LOG_ERROR, "Invalid lowpass height\n");
                 ret = AVERROR(EINVAL);
                 break;
@@ -366,7 +366,7 @@
             s->plane[s->channel_num].band[s->level][s->subband_num].width  = data;
             s->plane[s->channel_num].band[s->level][s->subband_num].stride = FFALIGN(data, 8);
             av_log(avctx, AV_LOG_DEBUG, "Highpass width %i channel %i level %i subband %i\n", data, s->channel_num, s->level, s->subband_num);
-            if (data < 2) {
+            if (data < 3) {
                 av_log(avctx, AV_LOG_ERROR, "Invalid highpass width\n");
                 ret = AVERROR(EINVAL);
                 break;
@@ -374,7 +374,7 @@
         } else if (tag == 42) {
             s->plane[s->channel_num].band[s->level][s->subband_num].height = data;
             av_log(avctx, AV_LOG_DEBUG, "Highpass height %i\n", data);
-            if (data < 2) {
+            if (data < 3) {
                 av_log(avctx, AV_LOG_ERROR, "Invalid highpass height\n");
                 ret = AVERROR(EINVAL);
                 break;
@@ -383,7 +383,7 @@
             s->plane[s->channel_num].band[s->level][s->subband_num].width  = data;
             s->plane[s->channel_num].band[s->level][s->subband_num].stride = FFALIGN(data, 8);
             av_log(avctx, AV_LOG_DEBUG, "Highpass width2 %i\n", data);
-            if (data < 2) {
+            if (data < 3) {
                 av_log(avctx, AV_LOG_ERROR, "Invalid highpass width2\n");
                 ret = AVERROR(EINVAL);
                 break;
@@ -391,7 +391,7 @@
         } else if (tag == 50) {
             s->plane[s->channel_num].band[s->level][s->subband_num].height = data;
             av_log(avctx, AV_LOG_DEBUG, "Highpass height2 %i\n", data);
-            if (data < 2) {
+            if (data < 3) {
                 av_log(avctx, AV_LOG_ERROR, "Invalid highpass height2\n");
                 ret = AVERROR(EINVAL);
                 break;

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/diracdec.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/diracdec.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/dnxhddec.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/dnxhddec.c Changed

@@ -118,11 +118,6 @@
             av_log(ctx->avctx, AV_LOG_ERROR, "bit depth mismatches %d %d\n", ff_dnxhd_cid_table[index].bit_depth, bitdepth);
             return AVERROR_INVALIDDATA;
         }
-        if (bitdepth > 10) {
-            avpriv_request_sample(ctx->avctx, "DNXHR 12-bit");
-            if (ctx->avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL)
-                return AVERROR_PATCHWELCOME;
-        }
         ctx->cid_table = &ff_dnxhd_cid_table[index];
         av_log(ctx->avctx, AV_LOG_VERBOSE, "Profile cid %d.\n", cid);
 
@@ -133,7 +128,7 @@
         init_vlc(&ctx->ac_vlc, DNXHD_VLC_BITS, 257,
                  ctx->cid_table->ac_bits, 1, 1,
                  ctx->cid_table->ac_codes, 2, 2, 0);
-        init_vlc(&ctx->dc_vlc, DNXHD_DC_VLC_BITS, bitdepth + 4,
+        init_vlc(&ctx->dc_vlc, DNXHD_DC_VLC_BITS, bitdepth > 8 ? 14 : 12,
                  ctx->cid_table->dc_bits, 1, 1,
                  ctx->cid_table->dc_codes, 1, 1, 0);
         init_vlc(&ctx->run_vlc, DNXHD_VLC_BITS, 62,

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/exr.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/exr.c Changed

@@ -1027,8 +1027,9 @@
     uint64_t line_offset, uncompressed_size;
     uint16_t *ptr_x;
     uint8_t *ptr;
-    uint32_t data_size, line, col = 0;
-    uint32_t tileX, tileY, tileLevelX, tileLevelY;
+    uint32_t data_size;
+    uint64_t line, col = 0;
+    uint64_t tileX, tileY, tileLevelX, tileLevelY;
     const uint8_t *src;
     int axmax = (avctx->width - (s->xmax + 1)) * 2 * s->desc->nb_components; /* nb pixel to add at the right of the datawindow */
     int bxmin = s->xmin * 2 * s->desc->nb_components; /* nb pixel to add at the left of the datawindow */
@@ -1059,9 +1060,18 @@
             return AVERROR_PATCHWELCOME;
         }
 
+        if (s->xmin || s->ymin) {
+            avpriv_report_missing_feature(s->avctx, "Tiles with xmin/ymin");
+            return AVERROR_PATCHWELCOME;
+        }
+
         line = s->tile_attr.ySize * tileY;
         col = s->tile_attr.xSize * tileX;
 
+        if (line < s->ymin || line > s->ymax ||
+            col  < s->xmin || col  > s->xmax)
+            return AVERROR_INVALIDDATA;
+
         td->ysize = FFMIN(s->tile_attr.ySize, s->ydelta - tileY * s->tile_attr.ySize);
         td->xsize = FFMIN(s->tile_attr.xSize, s->xdelta - tileX * s->tile_attr.xSize);

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/ffv1enc.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/ffv1enc.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/h264.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/h264.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/h264.h -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/h264.h Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/h2645_parse.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/h2645_parse.c Changed

@@ -30,10 +30,11 @@
 #include "h2645_parse.h"
 
 int ff_h2645_extract_rbsp(const uint8_t *src, int length,
-                          H2645NAL *nal)
+                          H2645NAL *nal, int small_padding)
 {
     int i, si, di;
     uint8_t *dst;
+    int64_t padding = small_padding ? 0 : MAX_MBPAIR_SIZE;
 
     nal->skipped_bytes = 0;
 #define STARTCODE_TEST                                                  \
@@ -81,16 +82,17 @@
     }
 #endif /* HAVE_FAST_UNALIGNED */
 
-    if (i >= length - 1) { // no escaped 0
+    if (i >= length - 1 && small_padding) { // no escaped 0
         nal->data     =
         nal->raw_data = src;
         nal->size     =
         nal->raw_size = length;
         return length;
-    }
+    } else if (i > length)
+        i = length;
 
-    av_fast_malloc(&nal->rbsp_buffer, &nal->rbsp_buffer_size,
-                   length + AV_INPUT_BUFFER_PADDING_SIZE);
+    av_fast_padded_malloc(&nal->rbsp_buffer, &nal->rbsp_buffer_size,
+                          length + padding);
     if (!nal->rbsp_buffer)
         return AVERROR(ENOMEM);
 
@@ -247,7 +249,7 @@
 
 int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
                           void *logctx, int is_nalff, int nal_length_size,
-                          enum AVCodecID codec_id)
+                          enum AVCodecID codec_id, int small_padding)
 {
     int consumed, ret = 0;
     const uint8_t *next_avc = is_nalff ? buf : buf + length;
@@ -258,19 +260,21 @@
         int extract_length = 0;
         int skip_trailing_zeros = 1;
 
-        if (buf >= next_avc) {
-            int i;
-            for (i = 0; i < nal_length_size; i++)
-                extract_length = (extract_length << 8) | buf[i];
+        if (buf == next_avc) {
+            int i = 0;
+            extract_length = get_nalsize(nal_length_size,
+                                         buf, length, &i, logctx);
+            if (extract_length < 0)
+                return extract_length;
+
             buf    += nal_length_size;
             length -= nal_length_size;
 
-            if (extract_length > length) {
-                av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit size.\n");
-                return AVERROR_INVALIDDATA;
-            }
             next_avc = buf + extract_length;
         } else {
+            if (buf > next_avc)
+                av_log(logctx, AV_LOG_WARNING, "Exceeded next NALFF position, re-syncing.\n");
+
             /* search start code */
             while (buf[0] != 0 || buf[1] != 0 || buf[2] != 1) {
                 ++buf;
@@ -290,7 +294,7 @@
 
             buf           += 3;
             length        -= 3;
-            extract_length = length;
+            extract_length = FFMIN(length, next_avc - buf);
 
             if (buf >= next_avc) {
                 /* skip to the start of the next NAL */
@@ -322,7 +326,7 @@
         }
         nal = &pkt->nals[pkt->nb_nals];
 
-        consumed = ff_h2645_extract_rbsp(buf, extract_length, nal);
+        consumed = ff_h2645_extract_rbsp(buf, extract_length, nal, small_padding);
         if (consumed < 0)
             return consumed;

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/h2645_parse.h -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/h2645_parse.h Changed

@@ -26,6 +26,8 @@
 #include "avcodec.h"
 #include "get_bits.h"
 
+#define MAX_MBPAIR_SIZE (256*1024) // a tighter bound could be calculated if someone cares about a few bytes
+
 typedef struct H2645NAL {
     uint8_t *rbsp_buffer;
     int rbsp_buffer_size;
@@ -74,18 +76,38 @@
  * Extract the raw (unescaped) bitstream.
  */
 int ff_h2645_extract_rbsp(const uint8_t *src, int length,
-                          H2645NAL *nal);
+                          H2645NAL *nal, int small_padding);
 
 /**
  * Split an input packet into NAL units.
  */
 int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
                           void *logctx, int is_nalff, int nal_length_size,
-                          enum AVCodecID codec_id);
+                          enum AVCodecID codec_id, int small_padding);
 
 /**
  * Free all the allocated memory in the packet.
  */
 void ff_h2645_packet_uninit(H2645Packet *pkt);
 
+static inline int get_nalsize(int nal_length_size, const uint8_t *buf,
+                              int buf_size, int *buf_index, void *logctx)
+{
+    int i, nalsize = 0;
+
+    if (*buf_index >= buf_size - nal_length_size) {
+        // the end of the buffer is reached, refill it
+        return AVERROR(EAGAIN);
+    }
+
+    for (i = 0; i < nal_length_size; i++)
+        nalsize = ((unsigned)nalsize << 8) | buf[(*buf_index)++];
+    if (nalsize <= 0 || nalsize > buf_size - *buf_index) {
+        av_log(logctx, AV_LOG_ERROR,
+               "Invalid nal size %d\n", nalsize);
+        return AVERROR_INVALIDDATA;
+    }
+    return nalsize;
+}
+
 #endif /* AVCODEC_H2645_PARSE_H */

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/h264_parse.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/h264_parse.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/h264_parser.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/h264_parser.c Changed

@@ -226,26 +226,6 @@
     return 0;
 }
 
-static inline int get_avc_nalsize(H264ParseContext *p, const uint8_t *buf,
-                                  int buf_size, int *buf_index, void *logctx)
-{
-    int i, nalsize = 0;
-
-    if (*buf_index >= buf_size - p->nal_length_size) {
-        // the end of the buffer is reached, refill it
-        return AVERROR(EAGAIN);
-    }
-
-    for (i = 0; i < p->nal_length_size; i++)
-        nalsize = ((unsigned)nalsize << 8) | buf[(*buf_index)++];
-    if (nalsize <= 0 || nalsize > buf_size - *buf_index) {
-        av_log(logctx, AV_LOG_ERROR,
-               "AVC: nal size %d\n", nalsize);
-        return AVERROR_INVALIDDATA;
-    }
-    return nalsize;
-}
-
 /**
  * Parse NAL units of found picture and decode some basic information.
  *
@@ -286,7 +266,7 @@
         int src_length, consumed, nalsize = 0;
 
         if (buf_index >= next_avc) {
-            nalsize = get_avc_nalsize(p, buf, buf_size, &buf_index, avctx);
+            nalsize = get_nalsize(p->nal_length_size, buf, buf_size, &buf_index, avctx);
             if (nalsize < 0)
                 break;
             next_avc = buf_index + nalsize;
@@ -316,7 +296,7 @@
             }
             break;
         }
-        consumed = ff_h2645_extract_rbsp(buf + buf_index, src_length, &nal);
+        consumed = ff_h2645_extract_rbsp(buf + buf_index, src_length, &nal, 1);
         if (consumed < 0)
             break;
 
@@ -367,13 +347,26 @@
                        "non-existing PPS %u referenced\n", pps_id);
                 goto fail;
             }
-            p->ps.pps = (const PPS*)p->ps.pps_list[pps_id]->data;
+
+            av_buffer_unref(&p->ps.pps_ref);
+            av_buffer_unref(&p->ps.sps_ref);
+            p->ps.pps = NULL;
+            p->ps.sps = NULL;
+            p->ps.pps_ref = av_buffer_ref(p->ps.pps_list[pps_id]);
+            if (!p->ps.pps_ref)
+                goto fail;
+            p->ps.pps = (const PPS*)p->ps.pps_ref->data;
+
             if (!p->ps.sps_list[p->ps.pps->sps_id]) {
                 av_log(avctx, AV_LOG_ERROR,
                        "non-existing SPS %u referenced\n", p->ps.pps->sps_id);
                 goto fail;
             }
-            p->ps.sps = (SPS*)p->ps.sps_list[p->ps.pps->sps_id]->data;
+
+            p->ps.sps_ref = av_buffer_ref(p->ps.sps_list[p->ps.pps->sps_id]);
+            if (!p->ps.sps_ref)
+                goto fail;
+            p->ps.sps = (SPS*)p->ps.sps_ref->data;
 
             sps = p->ps.sps;

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/hevc.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/hevc.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/hevc_parser.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/hevc_parser.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/indeo2.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/indeo2.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/jni.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/jni.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/libx264.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/libx264.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/mjpegdec.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/mjpegdec.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/qsvenc_hevc.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/qsvenc_hevc.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/raw.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/raw.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/rawdec.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/rawdec.c Changed

@@ -204,8 +204,9 @@
 
     desc = av_pix_fmt_desc_get(avctx->pix_fmt);
 
-    if ((avctx->bits_per_coded_sample == 8 || avctx->bits_per_coded_sample == 4
-            || avctx->bits_per_coded_sample <= 2) &&
+    if ((avctx->bits_per_coded_sample == 8 || avctx->bits_per_coded_sample == 4 ||
+         avctx->bits_per_coded_sample == 2 || avctx->bits_per_coded_sample == 1 ||
+         (avctx->bits_per_coded_sample == 0 && (context->is_nut_pal8 || context->is_mono)) ) &&
         (context->is_mono || context->is_pal8) &&
         (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' ') ||
                 context->is_nut_mono || context->is_nut_pal8)) {
@@ -365,20 +366,29 @@
     if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
         const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE,
                                                      NULL);
-        if (pal) {
-            av_buffer_unref(&context->palette);
+        int ret;
+        if (!context->palette)
             context->palette = av_buffer_alloc(AVPALETTE_SIZE);
-            if (!context->palette) {
-                av_buffer_unref(&frame->buf[0]);
-                return AVERROR(ENOMEM);
-            }
+        if (!context->palette) {
+            av_buffer_unref(&frame->buf[0]);
+            return AVERROR(ENOMEM);
+        }
+        ret = av_buffer_make_writable(&context->palette);
+        if (ret < 0) {
+            av_buffer_unref(&frame->buf[0]);
+            return ret;
+        }
+
+        if (pal) {
             memcpy(context->palette->data, pal, AVPALETTE_SIZE);
             frame->palette_has_changed = 1;
         } else if (context->is_nut_pal8) {
             int vid_size = avctx->width * avctx->height;
-            if (avpkt->size - vid_size) {
+            int pal_size = avpkt->size - vid_size;
+
+            if (avpkt->size > vid_size && pal_size <= AVPALETTE_SIZE) {
                 pal = avpkt->data + vid_size;
-                memcpy(context->palette->data, pal, avpkt->size - vid_size);
+                memcpy(context->palette->data, pal, pal_size);
                 frame->palette_has_changed = 1;
             }
         }

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/svq3.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/svq3.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/vaapi_encode_h264.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/vaapi_encode_h264.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/vaapi_encode_h265.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/vaapi_encode_h265.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/vp9_parser.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/vp9_parser.c Changed

@@ -28,6 +28,7 @@
 typedef struct VP9ParseContext {
     int n_frames; // 1-8
     int size[8];
+    int marker_size;
     int64_t pts;
 } VP9ParseContext;
 
@@ -89,6 +90,21 @@
     }
 
     if (s->n_frames > 0) {
+        int i;
+        int size_sum = 0;
+
+        for (i = 0; i < s->n_frames ;i++)
+            size_sum += s->size[i];
+        size_sum += s->marker_size;
+
+        if (size_sum != size) {
+            av_log(avctx, AV_LOG_ERROR, "Inconsistent input frame sizes %d %d\n",
+                   size_sum, size);
+            s->n_frames = 0;
+        }
+    }
+
+    if (s->n_frames > 0) {
         *out_data = data;
         *out_size = s->size[--s->n_frames];
         parse_frame(ctx, *out_data, *out_size);
@@ -131,6 +147,7 @@
                     data += sz; \
                     size -= sz; \
                 } \
+                s->marker_size = size; \
                 parse_frame(ctx, *out_data, *out_size); \
                 return s->n_frames > 0 ? *out_size : full_size

omxplayer-2016.06.26.tar.gz/ffmpeg/libavcodec/wmalosslessdec.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavcodec/wmalosslessdec.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavfilter/af_hdcd.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavfilter/af_hdcd.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavfilter/drawutils.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavfilter/drawutils.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavformat/flvdec.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavformat/flvdec.c Changed

@@ -61,6 +61,11 @@
 
     int broken_sizes;
     int sum_flv_tag_size;
+
+    int last_keyframe_stream_index;
+    int keyframe_count;
+    int64_t *keyframe_times;
+    int64_t *keyframe_filepositions;
 } FLVContext;
 
 static int probe(AVProbeData *p, int live)
@@ -92,8 +97,38 @@
     return probe(p, 1);
 }
 
+static void add_keyframes_index(AVFormatContext *s)
+{
+    FLVContext *flv   = s->priv_data;
+    AVStream *stream  = NULL;
+    unsigned int i    = 0;
+
+    if (flv->last_keyframe_stream_index < 0) {
+        av_log(s, AV_LOG_DEBUG, "keyframe stream hasn't been created\n");
+        return;
+    }
+
+    av_assert0(flv->last_keyframe_stream_index <= s->nb_streams);
+    stream = s->streams[flv->last_keyframe_stream_index];
+
+    if (stream->nb_index_entries == 0) {
+        for (i = 0; i < flv->keyframe_count; i++) {
+            av_add_index_entry(stream, flv->keyframe_filepositions[i],
+                flv->keyframe_times[i] * 1000, 0, 0, AVINDEX_KEYFRAME);
+        }
+    } else
+        av_log(s, AV_LOG_WARNING, "Skipping duplicate index\n");
+
+    if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
+        av_freep(&flv->keyframe_times);
+        av_freep(&flv->keyframe_filepositions);
+        flv->keyframe_count = 0;
+    }
+}
+
 static AVStream *create_stream(AVFormatContext *s, int codec_type)
 {
+    FLVContext *flv   = s->priv_data;
     AVStream *st = avformat_new_stream(s, NULL);
     if (!st)
         return NULL;
@@ -104,6 +139,8 @@
         s->ctx_flags &= ~AVFMTCTX_NOHEADER;
 
     avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
+    flv->last_keyframe_stream_index = s->nb_streams - 1;
+    add_keyframes_index(s);
     return st;
 }
 
@@ -305,8 +342,7 @@
     return length;
 }
 
-static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc,
-                                 AVStream *vstream, int64_t max_pos)
+static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t max_pos)
 {
     FLVContext *flv       = s->priv_data;
     unsigned int timeslen = 0, fileposlen = 0, i;
@@ -316,10 +352,12 @@
     int ret                = AVERROR(ENOSYS);
     int64_t initial_pos    = avio_tell(ioc);
 
-    if (vstream->nb_index_entries>0) {
-        av_log(s, AV_LOG_WARNING, "Skipping duplicate index\n");
+    if (flv->keyframe_count > 0) {
+        av_log(s, AV_LOG_DEBUG, "keyframes have been paresed\n");
         return 0;
     }
+    av_assert0(!flv->keyframe_times);
+    av_assert0(!flv->keyframe_filepositions);
 
     if (s->flags & AVFMT_FLAG_IGNIDX)
         return 0;
@@ -368,15 +406,16 @@
     }
 
     if (timeslen == fileposlen && fileposlen>1 && max_pos <= filepositions[0]) {
-        for (i = 0; i < fileposlen; i++) {
-            av_add_index_entry(vstream, filepositions[i], times[i] * 1000,
-                               0, 0, AVINDEX_KEYFRAME);
-            if (i < 2) {
-                flv->validate_index[i].pos = filepositions[i];
-                flv->validate_index[i].dts = times[i] * 1000;
-                flv->validate_count        = i + 1;
-            }
+        for (i = 0; i < FFMIN(2,fileposlen); i++) {
+            flv->validate_index[i].pos = filepositions[i];
+            flv->validate_index[i].dts = times[i] * 1000;
+            flv->validate_count        = i + 1;
         }
+        flv->keyframe_times = times;
+        flv->keyframe_filepositions = filepositions;
+        flv->keyframe_count = timeslen;
+        times = NULL;
+        filepositions = NULL;
     } else {
 invalid:
         av_log(s, AV_LOG_WARNING, "Invalid keyframes object, skipping.\n");
@@ -418,13 +457,14 @@
         }
         break;
     case AMF_DATA_TYPE_OBJECT:
-        if ((vstream || astream) && key &&
+        if (key &&
             ioc->seekable &&
             !strcmp(KEYFRAMES_TAG, key) && depth == 1)
-            if (parse_keyframes_index(s, ioc, vstream ? vstream : astream,
+            if (parse_keyframes_index(s, ioc,
                                       max_pos) < 0)
                 av_log(s, AV_LOG_ERROR, "Keyframe index parsing failed\n");
-
+            else
+                add_keyframes_index(s);
         while (avio_tell(ioc) < max_pos - 2 &&
                amf_get_string(ioc, str_val, sizeof(str_val)) > 0)
             if (amf_parse_object(s, astream, vstream, str_val, max_pos,
@@ -574,6 +614,7 @@
 
 static int flv_read_metabody(AVFormatContext *s, int64_t next_pos)
 {
+    FLVContext *flv = s->priv_data;
     AMFDataType type;
     AVStream *stream, *astream, *vstream;
     AVStream av_unused *dstream;
@@ -612,10 +653,14 @@
     // the lookup every time it is called.
     for (i = 0; i < s->nb_streams; i++) {
         stream = s->streams[i];
-        if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
+        if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
             vstream = stream;
-        else if (stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+            flv->last_keyframe_stream_index = i;
+        } else if (stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
             astream = stream;
+            if (flv->last_keyframe_stream_index == -1)
+                flv->last_keyframe_stream_index = i;
+        }
         else if (stream->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE)
             dstream = stream;
     }
@@ -643,6 +688,7 @@
 
     s->start_time = 0;
     flv->sum_flv_tag_size = 0;
+    flv->last_keyframe_stream_index = -1;
 
     return 0;
 }
@@ -653,6 +699,8 @@
     FLVContext *flv = s->priv_data;
     for (i=0; i<FLV_STREAM_TYPE_NB; i++)
         av_freep(&flv->new_extradata[i]);
+    av_freep(&flv->keyframe_times);
+    av_freep(&flv->keyframe_filepositions);
     return 0;
 }

omxplayer-2016.06.26.tar.gz/ffmpeg/libavformat/hls.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavformat/hls.c Changed

@@ -98,7 +98,11 @@
     int index;
     AVFormatContext *ctx;
     AVPacket pkt;
-    int stream_offset;
+
+    /* main demuxer streams associated with this playlist
+     * indexed by the subdemuxer stream indexes */
+    AVStream **main_streams;
+    int n_main_streams;
 
     int finished;
     enum PlaylistType type;
@@ -239,6 +243,7 @@
         struct playlist *pls = c->playlists[i];
         free_segment_list(pls);
         free_init_section_list(pls);
+        av_freep(&pls->main_streams);
         av_freep(&pls->renditions);
         av_freep(&pls->id3_buf);
         av_dict_free(&pls->id3_initial);
@@ -590,7 +595,7 @@
 }
 
 static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
-                    AVDictionary *opts, AVDictionary *opts2)
+                    AVDictionary *opts, AVDictionary *opts2, int *is_http)
 {
     HLSContext *c = s->priv_data;
     AVDictionary *tmp = NULL;
@@ -631,6 +636,9 @@
 
     av_dict_free(&tmp);
 
+    if (is_http)
+        *is_http = av_strstart(proto_name, "http", NULL);
+
     return ret;
 }
 
@@ -1072,6 +1080,7 @@
 {
     AVDictionary *opts = NULL;
     int ret;
+    int is_http = 0;
 
     // broker prior HTTP options that should be consistent across requests
     av_dict_set(&opts, "user-agent", c->user_agent, 0);
@@ -1091,13 +1100,13 @@
            seg->url, seg->url_offset, pls->index);
 
     if (seg->key_type == KEY_NONE) {
-        ret = open_url(pls->parent, &pls->input, seg->url, c->avio_opts, opts);
+        ret = open_url(pls->parent, &pls->input, seg->url, c->avio_opts, opts, &is_http);
     } else if (seg->key_type == KEY_AES_128) {
         AVDictionary *opts2 = NULL;
         char iv[33], key[33], url[MAX_URL_SIZE];
         if (strcmp(seg->key, pls->key_url)) {
             AVIOContext *pb;
-            if (open_url(pls->parent, &pb, seg->key, c->avio_opts, opts) == 0) {
+            if (open_url(pls->parent, &pb, seg->key, c->avio_opts, opts, NULL) == 0) {
                 ret = avio_read(pb, pls->key, sizeof(pls->key));
                 if (ret != sizeof(pls->key)) {
                     av_log(NULL, AV_LOG_ERROR, "Unable to read key file %s\n",
@@ -1122,7 +1131,7 @@
         av_dict_set(&opts2, "key", key, 0);
         av_dict_set(&opts2, "iv", iv, 0);
 
-        ret = open_url(pls->parent, &pls->input, url, opts2, opts);
+        ret = open_url(pls->parent, &pls->input, url, opts2, opts, &is_http);
 
         av_dict_free(&opts2);
 
@@ -1140,8 +1149,15 @@
 
     /* Seek to the requested position. If this was a HTTP request, the offset
      * should already be where want it to, but this allows e.g. local testing
-     * without a HTTP server. */
-    if (ret == 0 && seg->key_type == KEY_NONE && seg->url_offset) {
+     * without a HTTP server.
+     *
+     * This is not done for HTTP at all as avio_seek() does internal bookkeeping
+     * of file offset which is out-of-sync with the actual offset when "offset"
+     * AVOption is used with http protocol, causing the seek to not be a no-op
+     * as would be expected. Wrong offset received from the server will not be
+     * noticed without the call, though.
+     */
+    if (ret == 0 && !is_http && seg->key_type == KEY_NONE && seg->url_offset) {
         int64_t seekret = avio_seek(pls->input, seg->url_offset, SEEK_SET);
         if (seekret < 0) {
             av_log(pls->parent, AV_LOG_ERROR, "Unable to seek to offset %"PRId64" of HLS segment '%s'\n", seg->url_offset, seg->url);
@@ -1237,13 +1253,13 @@
 
         /* Check that the playlist is still needed before opening a new
          * segment. */
-        if (v->ctx && v->ctx->nb_streams &&
-            v->parent->nb_streams >= v->stream_offset + v->ctx->nb_streams) {
+        if (v->ctx && v->ctx->nb_streams) {
             v->needed = 0;
-            for (i = v->stream_offset; i < v->stream_offset + v->ctx->nb_streams;
-                i++) {
-                if (v->parent->streams[i]->discard < AVDISCARD_ALL)
+            for (i = 0; i < v->n_main_streams; i++) {
+                if (v->main_streams[i]->discard < AVDISCARD_ALL) {
                     v->needed = 1;
+                    break;
+                }
             }
         }
         if (!v->needed) {
@@ -1381,8 +1397,8 @@
     int rend_idx = 0;
     int i;
 
-    for (i = 0; i < pls->ctx->nb_streams; i++) {
-        AVStream *st = s->streams[pls->stream_offset + i];
+    for (i = 0; i < pls->n_main_streams; i++) {
+        AVStream *st = pls->main_streams[i];
 
         if (st->codecpar->codec_type != type)
             continue;
@@ -1508,7 +1524,8 @@
 {
     void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb;
     HLSContext *c = s->priv_data;
-    int ret = 0, i, j, stream_offset = 0;
+    int ret = 0, i, j;
+    int highest_cur_seq_no = 0;
 
     c->ctx                = s;
     c->interrupt_callback = &s->interrupt_callback;
@@ -1583,6 +1600,17 @@
             add_renditions_to_variant(c, var, AVMEDIA_TYPE_SUBTITLE, var->subtitles_group);
     }
 
+    /* Select the starting segments */
+    for (i = 0; i < c->n_playlists; i++) {
+        struct playlist *pls = c->playlists[i];
+
+        if (pls->n_segments == 0)
+            continue;
+
+        pls->cur_seq_no = select_cur_seq_no(c, pls);
+        highest_cur_seq_no = FFMAX(highest_cur_seq_no, pls->cur_seq_no);
+    }
+
     /* Open the demuxer for each playlist */
     for (i = 0; i < c->n_playlists; i++) {
         struct playlist *pls = c->playlists[i];
@@ -1599,7 +1627,18 @@
         pls->index  = i;
         pls->needed = 1;
         pls->parent = s;
-        pls->cur_seq_no = select_cur_seq_no(c, pls);
+
+        /*
+         * If this is a live stream and this playlist looks like it is one segment
+         * behind, try to sync it up so that every substream starts at the same
+         * time position (so e.g. avformat_find_stream_info() will see packets from
+         * all active streams within the first few seconds). This is not very generic,
+         * though, as the sequence numbers are technically independent.
+         */
+        if (!pls->finished && pls->cur_seq_no == highest_cur_seq_no - 1 &&
+            highest_cur_seq_no < pls->start_seq_no + pls->n_segments) {
+            pls->cur_seq_no = highest_cur_seq_no;
+        }
 
         pls->read_buffer = av_malloc(INITIAL_BUFFER_SIZE);
         if (!pls->read_buffer){
@@ -1625,7 +1664,6 @@
         }
         pls->ctx->pb       = &pls->pb;
         pls->ctx->io_open  = nested_io_open;
-        pls->stream_offset = stream_offset;
 
         if ((ret = ff_copy_whiteblacklists(pls->ctx, s)) < 0)
             goto fail;
@@ -1665,13 +1703,13 @@
                 avpriv_set_pts_info(st, 33, 1, MPEG_TIME_BASE);
             else
                 avpriv_set_pts_info(st, ist->pts_wrap_bits, ist->time_base.num, ist->time_base.den);
+
+            dynarray_add(&pls->main_streams, &pls->n_main_streams, st);
         }
 
         add_metadata_from_renditions(s, pls, AVMEDIA_TYPE_AUDIO);
         add_metadata_from_renditions(s, pls, AVMEDIA_TYPE_VIDEO);
         add_metadata_from_renditions(s, pls, AVMEDIA_TYPE_SUBTITLE);
-
-        stream_offset += pls->ctx->nb_streams;
     }
 
     /* Create a program for each variant */
@@ -1689,10 +1727,10 @@
             int is_shared = playlist_in_multiple_variants(c, pls);
             int k;
 
-            for (k = 0; k < pls->ctx->nb_streams; k++) {
-                struct AVStream *st = s->streams[pls->stream_offset + k];
+            for (k = 0; k < pls->n_main_streams; k++) {

omxplayer-2016.06.26.tar.gz/ffmpeg/libavformat/librtmp.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavformat/librtmp.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavformat/mov.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavformat/mov.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavformat/oggdec.h -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavformat/oggdec.h Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavformat/oggparsevp8.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavformat/oggparsevp8.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavformat/rtpdec_asf.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavformat/rtpdec_asf.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavformat/swfdec.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavformat/swfdec.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavformat/wtvdec.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavformat/wtvdec.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavutil/hwcontext_vaapi.c -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavutil/hwcontext_vaapi.c Changed

omxplayer-2016.06.26.tar.gz/ffmpeg/libavutil/opt.h -> omxplayer-2016.08.03.tar.gz/ffmpeg/libavutil/opt.h Changed

omxplayer-2016.08.03.tar.gz/linux/OMXAlsa.cpp Added

@@ -0,0 +1,1353 @@
+/*
+ * OMX IL Alsa Sink component
+ * Copyright (c) 2016 Timo Teräs
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * TODO:
+ * - timeouts for state transition failures
+ */
+
+#include <time.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <alsa/asoundlib.h>
+#include <IL/OMX_Core.h>
+#include <IL/OMX_Component.h>
+#include <IL/OMX_Broadcom.h>
+
+extern "C" {
+#include <libavutil/channel_layout.h>
+#include <libavutil/opt.h>
+#include <libswresample/swresample.h>
+}
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+
+struct _GOMX_COMMAND;
+struct _GOMX_PORT;
+struct _GOMX_COMPONENT;
+
+template <class X> static inline X max(X a, X b)
+{
+	return (a > b) ? a : b;
+}
+
+template <class X> static OMX_ERRORTYPE omx_cast(X* &toptr, OMX_PTR fromptr)
+{
+	toptr = (X*) fromptr;
+	if (toptr->nSize < sizeof(X)) return OMX_ErrorBadParameter;
+	if (toptr->nVersion.nVersion != OMX_VERSION) return OMX_ErrorVersionMismatch;
+	return OMX_ErrorNone;
+}
+
+template <class X> static void omx_init(X &omx)
+{
+	omx.nSize = sizeof(X);
+	omx.nVersion.nVersion = OMX_VERSION;
+}
+
+#if 1
+#include <utils/log.h>
+#define CLOG(notice, comp, port, msg, ...) do { \
+	struct _GOMX_PORT *_port = (struct _GOMX_PORT *) port; \
+	if (_port) CLog::Log(notice ? LOGNOTICE : LOGDEBUG, "[%p port %d]: %s: " msg "\n", comp, _port->def.nPortIndex, __func__ , ##__VA_ARGS__); \
+	else CLog::Log(notice ? LOGNOTICE : LOGDEBUG, "[%p] %s: " msg "\n", comp, __func__ , ##__VA_ARGS__); \
+} while (0)
+#else
+#define CLOG(notice, comp, port, msg, ...) do { \
+	struct _GOMX_PORT *_port = (struct _GOMX_PORT *) port; \
+	if (_port) fprintf(stderr, "[%p port %d]: %s: " msg "\n", comp, _port->def.nPortIndex, __func__ , ##__VA_ARGS__); \
+	else fprintf(stderr, "[%p] %s: " msg "\n", comp, __func__ , ##__VA_ARGS__); \
+} while (0)
+#endif
+
+#define CINFO(comp, port, msg, ...) CLOG(1, comp, port, msg , ##__VA_ARGS__)
+#define CDEBUG(comp, port, msg, ...) CLOG(0, comp, port, msg , ##__VA_ARGS__)
+
+/* Generic OMX helpers */
+
+typedef struct _GOMX_QUEUE {
+	void *head, *tail;
+	ptrdiff_t offset;
+	size_t num;
+} GOMX_QUEUE;
+
+static void gomxq_init(GOMX_QUEUE *q, ptrdiff_t offset)
+{
+	q->head = q->tail = 0;
+	q->offset = offset;
+	q->num = 0;
+}
+
+static void **gomxq_nextptr(GOMX_QUEUE *q, void *item)
+{
+	return (void**) ((uint8_t*)item + q->offset);
+}
+
+static void gomxq_enqueue(GOMX_QUEUE *q, void *item)
+{
+	*gomxq_nextptr(q, item) = 0;
+	if (q->tail) {
+		*gomxq_nextptr(q, q->tail) = item;
+		q->tail = item;
+	} else {
+		q->head = q->tail = item;
+	}
+	q->num++;
+}
+
+static void *gomxq_dequeue(GOMX_QUEUE *q)
+{
+	void *item = q->head;
+	if (item) {
+		q->head = *gomxq_nextptr(q, item);
+		if (!q->head) q->tail = 0;
+		q->num--;
+	}
+	return item;
+}
+
+typedef struct _GOMX_COMMAND {
+	void *next;
+	OMX_COMMANDTYPE cmd;
+	OMX_U32 param;
+	OMX_PTR data;
+} GOMX_COMMAND;
+
+typedef struct _GOMX_PORT {
+	OMX_BOOL new_enabled;
+	OMX_PARAM_PORTDEFINITIONTYPE def;
+
+	size_t num_buffers, num_buffers_old;
+	pthread_cond_t cond_no_buffers;
+	pthread_cond_t cond_populated;
+	pthread_cond_t cond_idle;
+
+	OMX_HANDLETYPE tunnel_comp;
+	OMX_U32 tunnel_port;
+	bool tunnel_supplier;
+	GOMX_QUEUE tunnel_supplierq;
+
+	OMX_ERRORTYPE (*do_buffer)(struct _GOMX_COMPONENT *, struct _GOMX_PORT *, OMX_BUFFERHEADERTYPE *);
+	OMX_ERRORTYPE (*flush)(struct _GOMX_COMPONENT *, struct _GOMX_PORT *);
+} GOMX_PORT;
+
+typedef struct _GOMX_COMPONENT {
+	OMX_COMPONENTTYPE omx;
+	OMX_CALLBACKTYPE cb;
+	OMX_STATETYPE state, wanted_state;
+
+	pthread_t component_thread, worker_thread;
+	pthread_mutex_t mutex;
+	pthread_cond_t cond;
+
+	const char *name;
+	size_t nports;
+	GOMX_PORT *ports;
+	GOMX_QUEUE cmdq;
+
+	void* (*worker)(void *);
+	OMX_ERRORTYPE (*statechange)(struct _GOMX_COMPONENT *);
+} GOMX_COMPONENT;
+
+static GOMX_PORT *gomx_get_port(GOMX_COMPONENT *comp, size_t idx)
+{
+	if (idx < 0 || idx >= comp->nports) return 0;
+	return &comp->ports[idx];
+}
+
+OMX_ERRORTYPE gomx_get_component_version(
+		OMX_HANDLETYPE hComponent, OMX_STRING pComponentName,
+		OMX_VERSIONTYPE *pComponentVersion, OMX_VERSIONTYPE *pSpecVersion, OMX_UUIDTYPE *pComponentUUID)
+{
+	GOMX_COMPONENT *comp = (GOMX_COMPONENT *) hComponent;
+	CDEBUG(comp, 0, "enter");
+	strcpy(pComponentName, comp->name);
+	pComponentVersion->nVersion = OMX_VERSION;
+	pSpecVersion->nVersion = OMX_VERSION;
+	memcpy(pComponentUUID, &hComponent, sizeof hComponent);
+	return OMX_ErrorNone;
+}
+
+static OMX_ERRORTYPE gomx_get_parameter(OMX_HANDLETYPE hComponent, OMX_INDEXTYPE nParamIndex, OMX_PTR pComponentParameterStructure)
+{
+	GOMX_COMPONENT *comp = (GOMX_COMPONENT *) hComponent;
+	GOMX_PORT *port;
+	OMX_PORT_PARAM_TYPE *ppt;
+	OMX_PARAM_PORTDEFINITIONTYPE *pdt;
+	OMX_ERRORTYPE r;
+	OMX_PORTDOMAINTYPE domain;
+
+	if (comp->state == OMX_StateInvalid) return OMX_ErrorInvalidState;
+
+	CDEBUG(comp, 0, "called %x, %p", nParamIndex, pComponentParameterStructure);
+	switch (nParamIndex) {
+	case OMX_IndexParamAudioInit:
+		domain = OMX_PortDomainAudio;
+		goto param_init;
+	case OMX_IndexParamVideoInit:
+		domain = OMX_PortDomainVideo;
+		goto param_init;
+	case OMX_IndexParamImageInit:

omxplayer-2016.08.03.tar.gz/linux/OMXAlsa.h Added

omxplayer-2016.06.26.tar.gz/omxplayer.1 -> omxplayer-2016.08.03.tar.gz/omxplayer.1 Changed

omxplayer-2016.06.26.tar.gz/omxplayer.cpp -> omxplayer-2016.08.03.tar.gz/omxplayer.cpp Changed

@@ -706,10 +706,24 @@
         m_stats = true;
         break;
       case 'o':
-        m_config_audio.device = optarg;
-        if(m_config_audio.device != "local" && m_config_audio.device != "hdmi" && m_config_audio.device != "both")
         {
-          printf("Bad argument for -%c: Output device must be `local', `hdmi' or `both'\n", c);
+          CStdString str = optarg;
+          int colon = str.Find(':');
+          if(colon >= 0)
+          {
+            m_config_audio.device = str.Mid(0, colon);
+            m_config_audio.subdevice = str.Mid(colon + 1, str.GetLength() - colon);
+          }
+          else
+          {
+            m_config_audio.device = str;
+            m_config_audio.subdevice = "";
+          }
+        }
+        if(m_config_audio.device != "local" && m_config_audio.device != "hdmi" && m_config_audio.device != "both" &&
+           m_config_audio.device != "alsa")
+        {
+          printf("Bad argument for -%c: Output device must be `local', `hdmi', `both' or `alsa'\n", c);
           return EXIT_FAILURE;
         }
         m_config_audio.device = "omx:" + m_config_audio.device;
@@ -1134,6 +1148,9 @@
       m_config_audio.device = "omx:local";
   }
 
+  if(m_config_audio.device == "omx:alsa" && m_config_audio.subdevice.empty())
+    m_config_audio.subdevice = "default";
+
   if ((m_config_audio.hints.codec == AV_CODEC_ID_AC3 || m_config_audio.hints.codec == AV_CODEC_ID_EAC3) &&
       m_BcmHost.vc_tv_hdmi_audio_supported(EDID_AudioFormat_eAC3, 2, EDID_AudioSampleRate_e44KHz, EDID_AudioSampleSize_16bit ) != 0)
     m_config_audio.passthrough = false;

Changes of Revision 15