October 2014 - MPlayer-cvslog - lists.mplayerhq.hu

r37305 - trunk/stream/stream_dvdnav.c
by reimar 24 Oct '14

24 Oct '14

Author: reimar Date: Sat Oct 25 01:01:02 2014 New Revision: 37305 Log: stream_dvdnav.c: Fix compatibility with newer libdvdnav. Modified: trunk/stream/stream_dvdnav.c Modified: trunk/stream/stream_dvdnav.c ============================================================================== --- trunk/stream/stream_dvdnav.c Thu Oct 23 23:21:09 2014 (r37304) +++ trunk/stream/stream_dvdnav.c Sat Oct 25 01:01:02 2014 (r37305) @@ -38,6 +38,13 @@ #include "help_mp.h" #include "stream_dvd_common.h" +#ifndef DVDNAV_FORMAT_AC3 +#define DVDNAV_FORMAT_AC3 DVD_AUDIO_FORMAT_AC3 +#define DVDNAV_FORMAT_DTS DVD_AUDIO_FORMAT_DTS +#define DVDNAV_FORMAT_LPCM DVD_AUDIO_FORMAT_LPCM +#define DVDNAV_FORMAT_MPEGAUDIO DVD_AUDIO_FORMAT_MPEG +#endif + /* state flags */ typedef enum { NAV_FLAG_EOF = 1 << 0, /* end of stream has been reached */

1 0

r37304 - trunk/libmpdemux/demux_ogg.c
by reimar 23 Oct '14

23 Oct '14

Author: reimar Date: Thu Oct 23 23:21:09 2014 New Revision: 37304 Log: demux_ogg: Hacky, not-quite-correct support for Opus. Not correct in the meaning that the FFmpeg decoder at least complains about some invalid packets. Have not noticed any real issues in short testing though. Modified: trunk/libmpdemux/demux_ogg.c Modified: trunk/libmpdemux/demux_ogg.c ============================================================================== --- trunk/libmpdemux/demux_ogg.c Wed Oct 22 21:40:55 2014 (r37303) +++ trunk/libmpdemux/demux_ogg.c Thu Oct 23 23:21:09 2014 (r37304) @@ -37,6 +37,7 @@ #include "demux_mov.h" #include "demux_ogg.h" +#define FOURCC_OPUS mmioFOURCC('o', 'p', 'u', 's') #define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's') #define FOURCC_SPEEX mmioFOURCC('s', 'p', 'x', ' ') #define FOURCC_THEORA mmioFOURCC('t', 'h', 'e', 'o') @@ -121,6 +122,7 @@ typedef struct ogg_stream { // Logical stream state ogg_stream_state stream; int hdr_packets; + int opus; int vorbis; int speex; int theora; @@ -288,7 +290,7 @@ static unsigned char *demux_ogg_read_pac os->lastsize = blocksize; os->lastpos = pack->granulepos; } - } else if (os->speex) { + } else if (os->speex || os->opus) { // whole packet (default) # ifdef CONFIG_OGGTHEORA } else if (os->theora) { @@ -512,7 +514,7 @@ static int demux_ogg_add_packet(demux_st // (PACKET_TYPE_HEADER bit doesn't even exist for theora ?!) // We jump nothing for FLAC. Ain't this great? Packet contents have to be // handled differently for each and every stream type. The joy! The joy! - if (!os->flac && (*pack->packet & PACKET_TYPE_HEADER) && + if (!os->opus && !os->flac && (*pack->packet & PACKET_TYPE_HEADER) && ds->sh && (ds != d->audio || ((sh_audio_t*)ds->sh)->format != FOURCC_VORBIS || os->hdr_packets >= NUM_VORBIS_HDR_PACKETS ) && (ds != d->video || (((sh_video_t*)ds->sh)->format != FOURCC_THEORA))) @@ -865,6 +867,15 @@ int demux_ogg_open(demuxer_t *demuxer) mp_msg(MSGT_DEMUX, MSGL_INFO, "[Ogg] stream %d: audio (Vorbis), -aid %d\n", ogg_d->num_sub, n_audio - 1); + } else if (pack.bytes >= 8 && !strncmp(pack.packet, "OpusHead", 8)) { + sh_a = new_sh_audio_aid(demuxer, ogg_d->num_sub, n_audio, NULL); + sh_a->format = FOURCC_OPUS; + ogg_d->subs[ogg_d->num_sub].opus = 1; + ogg_d->subs[ogg_d->num_sub].id = n_audio; + n_audio++; + mp_msg(MSGT_DEMUX, MSGL_INFO, + "[Ogg] stream %d: audio (Opus), -aid %d\n", + ogg_d->num_sub, n_audio - 1); } else if (pack.bytes >= 80 && !strncmp(pack.packet, "Speex", 5)) { sh_a = new_sh_audio_aid(demuxer, ogg_d->num_sub, n_audio, NULL); sh_a->wf = calloc(1, sizeof(*sh_a->wf) + pack.bytes); @@ -1549,7 +1560,7 @@ static void demux_ogg_seek(demuxer_t *de break; } } - if (!precision && (is_keyframe || os->vorbis || os->speex)) { + if (!precision && (is_keyframe || os->vorbis || os->speex || os->opus)) { if (sub_clear_text(&ogg_sub, MP_NOPTS_VALUE)) { vo_sub = &ogg_sub; vo_osd_changed(OSDTYPE_SUBTITLE);

1 0

r37303 - trunk/libmpdemux/demux_ts.c
by reimar 22 Oct '14

22 Oct '14

Author: reimar Date: Wed Oct 22 21:40:55 2014 New Revision: 37303 Log: demux_ts: Do not claim PGS subtitles are teletext in log output. Modified: trunk/libmpdemux/demux_ts.c Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Sun Oct 19 17:26:28 2014 (r37302) +++ trunk/libmpdemux/demux_ts.c Wed Oct 22 21:40:55 2014 (r37303) @@ -913,7 +913,7 @@ static off_t ts_detect_streams(demuxer_t } if(IS_SUB(param->stype)) - mp_msg(MSGT_DEMUXER, MSGL_INFO, " SUB %s(pid=%d) ", (param->stype==SPU_DVD ? "DVD" : param->stype==SPU_DVB ? "DVB" : "Teletext"), param->spid); + mp_msg(MSGT_DEMUXER, MSGL_INFO, " SUB %s(pid=%d) ", (param->stype==SPU_DVD ? "DVD" : param->stype==SPU_DVB ? "DVB" : param->stype==SPU_PGS ? "PGS" : "Teletext"), param->spid); else { param->stype = UNKNOWN;

1 0

r37302 - trunk/etc/codecs.conf
by compn 19 Oct '14

19 Oct '14

Author: compn Date: Sun Oct 19 17:26:28 2014 New Revision: 37302 Log: codecs.conf: add UQY2 fourcc for utvideo Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sun Oct 19 16:29:00 2014 (r37301) +++ trunk/etc/codecs.conf Sun Oct 19 17:26:28 2014 (r37302) @@ -2728,7 +2728,7 @@ videocodec ffutvideo info "FFmpeg Ut Video" status working fourcc ULRA,ULRG,ULY2,ULY0 - fourcc ULH2,ULH0 + fourcc ULH2,ULH0,UQY2 driver ffmpeg dll utvideo out YV12,422P,RGB24,RGB32 @@ -2738,6 +2738,7 @@ videocodec utvideovfw info "UTVideo Codec" status working fourcc ULRA,ULRG,ULY2,ULY0 + fourcc ULH2,ULH0,UQY2 driver vfw dll "utv_vcm.dll" ; requires utv_core.dll out BGR32,BGR24 flip @@ -2749,6 +2750,7 @@ videocodec utvideodmo info "UTVideo Codec" status buggy ; input format not accepted fourcc ULRA,ULRG,ULY2,ULY0 + fourcc ULH2,ULH0,UQY2 driver dmo dll "utv_dmo.dll" ; requires utv_core.dll guid 0x30594c55, 0xe991, 0x460d, 0x84, 0x0b, 0xc1, 0xc6, 0x49, 0x74, 0x57, 0xef

1 0

r37301 - trunk/libmpdemux/mp_taglists.c
by cehoyos 19 Oct '14

19 Oct '14

Author: cehoyos Date: Sun Oct 19 16:29:00 2014 New Revision: 37301 Log: Support mpegts/hevc streams with -demuxer lavf. Modified: trunk/libmpdemux/mp_taglists.c Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Sun Oct 19 03:56:59 2014 (r37300) +++ trunk/libmpdemux/mp_taglists.c Sun Oct 19 16:29:00 2014 (r37301) @@ -119,6 +119,7 @@ static const struct AVCodecTag mp_codeci #endif { AV_CODEC_ID_G729, MKTAG('G', '7', '2', '9') }, { AV_CODEC_ID_H264, MKTAG('H', '2', '6', '4') }, + { AV_CODEC_ID_HEVC, MKTAG('H', 'E', 'V', 'C') }, { AV_CODEC_ID_MP3, 0x55 }, { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'V') }, #if LIBAVUTIL_VERSION_MICRO >= 100

1 0

r37298 - trunk/libmpdemux/video.c
by reimar 18 Oct '14

18 Oct '14

Author: reimar Date: Sat Oct 18 18:07:11 2014 New Revision: 37298 Log: video.c: rework H.264 parser and add very basic HEVC parser. Modified: trunk/libmpdemux/video.c Modified: trunk/libmpdemux/video.c ============================================================================== --- trunk/libmpdemux/video.c Sat Oct 18 18:07:10 2014 (r37297) +++ trunk/libmpdemux/video.c Sat Oct 18 18:07:11 2014 (r37298) @@ -57,6 +57,7 @@ typedef enum { VIDEO_MPEG12, VIDEO_MPEG4, VIDEO_H264, + VIDEO_HEVC, VIDEO_VC1, VIDEO_OTHER } video_codec_t; @@ -94,6 +95,9 @@ static video_codec_t find_video_codec(sh else if((fmt == DEMUXER_TYPE_MPEG_PS || fmt == DEMUXER_TYPE_MPEG_TS) && (sh_video->format==mmioFOURCC('W', 'V', 'C', '1'))) return VIDEO_VC1; + else if((fmt == DEMUXER_TYPE_MPEG_PS || fmt == DEMUXER_TYPE_MPEG_TS) && + (sh_video->format==mmioFOURCC('H', 'E', 'V', 'C'))) + return VIDEO_HEVC; else if (fmt == DEMUXER_TYPE_ASF && sh_video->bih && sh_video->bih->biCompression == mmioFOURCC('D', 'V', 'R', ' ')) return VIDEO_MPEG12; else @@ -268,6 +272,18 @@ switch(video_codec){ } break; } + case VIDEO_HEVC: { + videobuf_len=0; videobuf_code_len=0; + if(!videobuffer) { + videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); + if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); + else { + mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); + return 0; + } + } + break; + } case VIDEO_MPEG12: { if (d_video->demuxer->file_format == DEMUXER_TYPE_ASF) { // DVR-MS if(!sh_video->bih) return 0; @@ -519,40 +535,57 @@ int video_read_frame(sh_video_t* sh_vide int in_picture = 0; while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ int i=sync_video_packet(d_video); + int mi = i & ~0x60; int pos = videobuf_len+4; if(!i) return -1; + if (in_picture) { + // here starts the access unit end detection code + // see the mail on MPlayer-dev-eng for details: + // Date: Sat, 17 Sep 2005 11:24:06 +0200 + // Subject: Re: [MPlayer-dev-eng] [RFC] h264 ES parser problems + // Message-ID: <20050917092406.GA7699(a)rz.uni-karlsruhe.de> + if (mi == 0x106 || mi == 0x107 || mi == 0x109) break; // SEI, SPS or access unit delim. + if (mi == 0x101 || mi == 0x102 || mi == 0x105) { + // assuming arbitrary slice ordering is not allowed, the + // first_mb_in_slice (golomb encoded) value should be 0 then + // for the first VCL NAL in a picture + if (demux_peekc(d_video) & 0x80) + break; + } + } if(!read_video_packet(d_video)) return -1; // EOF - if((i&~0x60) == 0x107 && i != 0x107) { + if(mi == 0x107 && i != 0x107) { h264_parse_sps(&picture, &(videobuffer[pos]), videobuf_len - pos); if(picture.fps > 0) { sh_video->fps=picture.fps; sh_video->frametime=1.0/picture.fps; } - i=sync_video_packet(d_video); - if(!i) return -1; - if(!read_video_packet(d_video)) return -1; // EOF - } - - // here starts the access unit end detection code - // see the mail on MPlayer-dev-eng for details: - // Date: Sat, 17 Sep 2005 11:24:06 +0200 - // Subject: Re: [MPlayer-dev-eng] [RFC] h264 ES parser problems - // Message-ID: <20050917092406.GA7699(a)rz.uni-karlsruhe.de> - if((i&~0x60) == 0x101 || (i&~0x60) == 0x102 || (i&~0x60) == 0x105) + } else if (mi == 0x101 || mi == 0x102 || mi == 0x105) { // found VCL NAL with slice header i.e. start of current primary coded // picture, so start scanning for the end now in_picture = 1; + } + } + *start=videobuffer; in_size=videobuf_len; + videobuf_len=0; + } else if(video_codec == VIDEO_HEVC){ + int in_picture = 0; + while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ + int i=sync_video_packet(d_video); + if(!i) return -1; + + i = (i >> 1) & 0x3f; if (in_picture) { - i = sync_video_packet(d_video) & ~0x60; // code of next packet - if(i == 0x106 || i == 0x109) break; // SEI or access unit delim. - if(i == 0x101 || i == 0x102 || i == 0x105) { - // assuming arbitrary slice ordering is not allowed, the - // first_mb_in_slice (golomb encoded) value should be 0 then - // for the first VCL NAL in a picture - if (demux_peekc(d_video) & 0x80) + if ((i >= 32 && i <= 35) || i == 39 || (i >= 41 && i <= 44) || (i >= 48 || i <= 55)) break; + if (i <= 9 || (i >= 16 && i <= 21)) { + // TODO: check first slice segment flag - need to peek 2 bytes ahead +// if (demux_peekc(d_video) & 0x80) break; } } + if(!read_video_packet(d_video)) return -1; // EOF + if (i <= 9 || (i >= 16 && i <= 21)) + in_picture = 1; } *start=videobuffer; in_size=videobuf_len; videobuf_len=0;

1 0

r37297 - trunk/etc/codecs.conf
by reimar 18 Oct '14

18 Oct '14

Author: reimar Date: Sat Oct 18 18:07:10 2014 New Revision: 37297 Log: codecs.conf: fix HEVC entry. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Oct 18 18:07:09 2014 (r37296) +++ trunk/etc/codecs.conf Sat Oct 18 18:07:10 2014 (r37297) @@ -1392,7 +1392,9 @@ videocodec ffhevc fourcc hev1 driver ffmpeg dll hevc - out YV12 + out YV12,420P9,420P10,420P12 + out 422P,422P9,422P10,444P12 + out 444P,444P9,444P10,444P12 videocodec ffh264 info "FFmpeg H.264"

1 0

r37296 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 18 Oct '14

18 Oct '14

Author: reimar Date: Sat Oct 18 18:07:09 2014 New Revision: 37296 Log: vd_ffmpeg: print warning about unexpected pixel format. Makes it easier to figure debug incorrect codec.conf entries. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sat Oct 18 18:07:07 2014 (r37295) +++ trunk/libmpcodecs/vd_ffmpeg.c Sat Oct 18 18:07:09 2014 (r37296) @@ -609,14 +609,19 @@ static int init_vo(sh_video_t *sh, enum const AVCodecContext *avctx = ctx->avctx; int width, height; int i; + int imgfmt = pixfmt2imgfmt2(pix_fmt, avctx->codec_id); // avoid initialization for formats not on the supported // list in the codecs.conf entry. for (i = 0; i < CODECS_MAX_OUTFMT; i++) - if (sh->codec->outfmt[i] == pixfmt2imgfmt2(pix_fmt, avctx->codec_id)) + if (sh->codec->outfmt[i] == imgfmt) break; - if (i == CODECS_MAX_OUTFMT) + if (i == CODECS_MAX_OUTFMT) { + if (imgfmt) + mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Unexpected decoder output format %s\n", + vo_format_name(imgfmt)); return -1; + } width = avctx->width; height = avctx->height;

1 0

r37295 - trunk/libmpdemux/demux_ts.c
by reimar 18 Oct '14

18 Oct '14

Author: reimar Date: Sat Oct 18 18:07:07 2014 New Revision: 37295 Log: demux_ts: Support HEVC signalled by 0x24 ISO type. Modified: trunk/libmpdemux/demux_ts.c Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Mon Oct 13 23:46:15 2014 (r37294) +++ trunk/libmpdemux/demux_ts.c Sat Oct 18 18:07:07 2014 (r37295) @@ -2564,6 +2564,9 @@ static int parse_pmt(ts_priv_t * priv, u case 0x13: pmt->es[idx].type = SL_SECTION; break; + case 0x24: + pmt->es[idx].type = VIDEO_HEVC; + break; case 0x80: pmt->es[idx].type = AUDIO_PCM_BR; break;

1 0

r37294 - trunk/configure
by al 13 Oct '14

13 Oct '14

Author: al Date: Mon Oct 13 23:46:15 2014 New Revision: 37294 Log: configure: Detect GnuTLS and enable FFmpeg https Allow playback of https:// URLs via FFmpeg. Fix ticket #2183 Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Oct 5 04:39:08 2014 (r37293) +++ trunk/configure Mon Oct 13 23:46:15 2014 (r37294) @@ -386,6 +386,7 @@ Optional features: --enable-ass-internal enable internal SSA/ASS subtitle support [autodetect] --disable-ass disable SSA/ASS subtitle support [autodetect] --enable-rpath enable runtime linker path for extra libs [disabled] + --disable-gnutls disable GnuTLS [autodetect] Codecs: --enable-gif enable GIF support [autodetect] @@ -848,6 +849,7 @@ _enca=auto _inet6=auto _sctp=auto _gethostbyname2=auto +_gnutls=auto _ftp=auto _musepack=no _vstream=auto @@ -1349,6 +1351,8 @@ for ac_option do --disable-ass-internal) ass_internal=no ;; --enable-rpath) _rpath=yes ;; --disable-rpath) _rpath=no ;; + --enable-gnutls) _gnutls=yes ;; + --disable-gnutls) _gnutls=no ;; --enable-fribidi) _fribidi=yes ;; --disable-fribidi) _fribidi=no ;; @@ -4329,6 +4333,24 @@ else fi +echocheck "GnuTLS" +if test "$_gnutls" = auto ; then + _gnutls=no + if $_pkg_config --exists gnutls ; then + statement_check gnutls/gnutls.h 'gnutls_global_init()' $($_pkg_config --libs --cflags gnutls) && + _gnutls=yes + fi +fi +if test "$_gnutls" = yes ; then + def_gnutls='#define CONFIG_GNUTLS 1' + libavprotocols="$libavprotocols HTTPS_PROTOCOL TLS_PROTOCOL" + extra_cflags="$extra_cflags $($_pkg_config --cflags gnutls)" + extra_ldflags="$extra_ldflags $($_pkg_config --libs gnutls)" +else + def_gnutls='#define CONFIG_GNUTLS 0' +fi +echores "$_gnutls" + echocheck "Samba support (libsmbclient)" if test "$_smb" = yes; then extra_ldflags="$extra_ldflags -lsmbclient" @@ -8694,6 +8716,7 @@ CONFIG_AC3DSP = yes CONFIG_BZLIB = $bzlib CONFIG_CRYSTALHD= $crystalhd CONFIG_ENCODERS = yes +CONFIG_GNUTLS = $_gnutls CONFIG_GPL = yes CONFIG_ICONV = $_iconv CONFIG_MLIB = $_mlib @@ -9229,7 +9252,7 @@ $def_truncf #define CONFIG_FASTDIV 0 #define CONFIG_FFSERVER 0 #define CONFIG_FTRAPV 0 -#define CONFIG_GNUTLS 0 +$def_gnutls #define CONFIG_GPL 1 #define CONFIG_GRAY 0 #define CONFIG_LIBMODPLUG 0

1 0