February 2016 - MPlayer-cvslog - lists.mplayerhq.hu

r37806 - trunk/libmpdemux/demux_ty.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 20:47:52 2016 New Revision: 37806 Log: demux_ty: Try to fix calculation of used file size. TiVo files can contain junk at the end, and this code finds where the "good" data ends. Unfortunately there was not a shred of sense in the original code. The code now seems to do at least something sensible with the few files I had to test. Fixes a warning from Coverity, which also thought this code made no sense. Modified: trunk/libmpdemux/demux_ty.c Modified: trunk/libmpdemux/demux_ty.c ============================================================================== --- trunk/libmpdemux/demux_ty.c Fri Feb 26 19:17:06 2016 (r37805) +++ trunk/libmpdemux/demux_ty.c Fri Feb 26 20:47:52 2016 (r37806) @@ -364,14 +364,12 @@ static int demux_ty_fill_buffer( demuxer demux->movi_end = demux->stream->end_pos; tivo->size = demux->stream->end_pos; } - else + else if ( tivo->readHeader == 0 ) { // If its a local file, try to find the Part Headers, so we can // calculate the ACTUAL stream size // If we can't find it, go off with the file size and hope the // extract program did the "right thing" - if ( tivo->readHeader == 0 ) - { off_t filePos; tivo->readHeader = 1; @@ -380,44 +378,27 @@ static int demux_ty_fill_buffer( demuxer readSize = stream_read( demux->stream, chunk, CHUNKSIZE ); - if ( memcmp( chunk, TMF_SIG, sizeof( TMF_SIG ) ) == 0 ) + if ( readSize >= sizeof( TMF_SIG ) && + memcmp( chunk, TMF_SIG, sizeof( TMF_SIG ) ) == 0 ) { mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Detected a tmf\n" ); tivo->tmf = 1; ty_tmf_filetoparts( demux, tivo ); - readSize = tmf_load_chunk( demux, tivo, chunk, 0 ); + if (tivo->tmf_totalparts > 0) { + tivo->size = tivo->tmfparts[tivo->tmf_totalparts - 1].startOffset + + tivo->tmfparts[tivo->tmf_totalparts - 1].fileSize; + } } - - if ( readSize == CHUNKSIZE && AV_RB32(chunk) == TIVO_PES_FILEID ) + else if ( readSize == CHUNKSIZE && AV_RB32(chunk) == TIVO_PES_FILEID ) { - off_t numberParts; - - readSize = 0; - - if ( tivo->tmf != 1 ) - { - off_t offset; - - numberParts = demux->stream->end_pos / TIVO_PART_LENGTH; - offset = numberParts * TIVO_PART_LENGTH; + off_t numberParts = (demux->stream->end_pos - CHUNKSIZE) / TIVO_PART_LENGTH; + off_t offset = numberParts * TIVO_PART_LENGTH; mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:ty/ty+Number Parts %"PRId64"\n", (int64_t)numberParts ); - if ( offset + CHUNKSIZE < demux->stream->end_pos ) - { stream_seek( demux->stream, offset ); readSize = stream_read( demux->stream, chunk, CHUNKSIZE ); - } - } - else - { - numberParts = tivo->tmf_totalparts; - offset = numberParts * TIVO_PART_LENGTH; - readSize = tmf_load_chunk( demux, tivo, chunk, - numberParts * ( TIVO_PART_LENGTH - CHUNKSIZE ) / - CHUNKSIZE ); - } if ( readSize == CHUNKSIZE && AV_RB32(chunk) == TIVO_PES_FILEID ) { @@ -436,7 +417,7 @@ static int demux_ty_fill_buffer( demuxer stream_seek( demux->stream, filePos ); demux->filepos = stream_tell( demux->stream ); tivo->whichChunk = filePos / CHUNKSIZE; - } + demux->movi_start = 0; demux->movi_end = tivo->size; }

1 0

r37805 - trunk/stream/asf_streaming.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 19:17:06 2016 New Revision: 37805 Log: asf_streaming: comment out unused code. It exists mostly to document a possible alternative which may or may not work. Modified: trunk/stream/asf_streaming.c Modified: trunk/stream/asf_streaming.c ============================================================================== --- trunk/stream/asf_streaming.c Fri Feb 26 19:14:04 2016 (r37804) +++ trunk/stream/asf_streaming.c Fri Feb 26 19:17:06 2016 (r37805) @@ -579,7 +579,7 @@ static HTTP_header_t *asf_http_request(s if(stream_id == asf_http_ctrl->audio_id) { enable = 0; } else { - enable = 2; + //enable = 2; continue; } asf_nb_stream++; @@ -592,7 +592,7 @@ static HTTP_header_t *asf_http_request(s if(stream_id == asf_http_ctrl->video_id) { enable = 0; } else { - enable = 2; + //enable = 2; continue; } asf_nb_stream++;

1 0

r37804 - trunk/libmpcodecs/ad_mpg123.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 19:14:04 2016 New Revision: 37804 Log: ad_mpg123: add check for set_format return value. Modified: trunk/libmpcodecs/ad_mpg123.c Modified: trunk/libmpcodecs/ad_mpg123.c ============================================================================== --- trunk/libmpcodecs/ad_mpg123.c Fri Feb 26 19:14:02 2016 (r37803) +++ trunk/libmpcodecs/ad_mpg123.c Fri Feb 26 19:14:04 2016 (r37804) @@ -331,6 +331,8 @@ static int decode_a_bit(sh_audio_t *sh, break; /* Do not switch format during a chunk. */ ret = set_format(sh, con); + if (ret == MPG123_ERR || ret == MPG123_DONE) + break; } }

1 0

r37803 - trunk/libmpcodecs/ad_mpg123.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 19:14:02 2016 New Revision: 37803 Log: ad_mpg123: minor code simplification. Modified: trunk/libmpcodecs/ad_mpg123.c Modified: trunk/libmpcodecs/ad_mpg123.c ============================================================================== --- trunk/libmpcodecs/ad_mpg123.c Thu Feb 25 23:39:17 2016 (r37802) +++ trunk/libmpcodecs/ad_mpg123.c Fri Feb 26 19:14:02 2016 (r37803) @@ -293,6 +293,11 @@ static int decode_a_bit(sh_audio_t *sh, if(con->new_format) ret = set_format(sh, con); + /* Theoretically, mpg123 could return MPG123_DONE, so be prepared. + * Should not happen in our usage, but it is a valid return code. */ + if (ret == MPG123_ERR || ret == MPG123_DONE) + break; + /* Feed the decoder. This will only fire from the second round on. */ if (ret == MPG123_NEED_MORE) { int incount; @@ -328,10 +333,6 @@ static int decode_a_bit(sh_audio_t *sh, ret = set_format(sh, con); } } - /* Theoretically, mpg123 could return MPG123_DONE, so be prepared. - * Should not happen in our usage, but it is a valid return code. */ - else if (ret == MPG123_ERR || ret == MPG123_DONE) - break; /* Try to decode a bit. This is the return value that counts * for the loop condition. */

1 0

r37802 - in trunk/libmpcodecs: vd_ffmpeg.c vf.c
by reimar 25 Feb '16

25 Feb '16

Author: reimar Date: Thu Feb 25 23:39:17 2016 New Revision: 37802 Log: mp_image: ensure unused pointers are cleared out. Fixes the MPlayer side of issue #2262, though I believe there is still a FFmpeg bug. Modified: trunk/libmpcodecs/vd_ffmpeg.c trunk/libmpcodecs/vf.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Thu Feb 25 22:34:45 2016 (r37801) +++ trunk/libmpcodecs/vd_ffmpeg.c Thu Feb 25 23:39:17 2016 (r37802) @@ -719,6 +719,12 @@ static int get_buffer(AVCodecContext *av mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type== MP_IMGTYPE_IPB ? "using IPB\n" : "using IP\n"); } + // Make sure to not leak dead pointers. + pic->data[0]= NULL; + pic->data[1]= NULL; + pic->data[2]= NULL; + pic->data[3]= NULL; + if (ctx->best_csp == IMGFMT_RGB8 || ctx->best_csp == IMGFMT_BGR8) flags |= MP_IMGFLAG_RGB_PALETTE; mpi= mpcodecs_get_image(sh, type, flags, width, height); Modified: trunk/libmpcodecs/vf.c ============================================================================== --- trunk/libmpcodecs/vf.c Thu Feb 25 22:34:45 2016 (r37801) +++ trunk/libmpcodecs/vf.c Thu Feb 25 23:39:17 2016 (r37802) @@ -372,6 +372,9 @@ mp_image_t* vf_get_image(vf_instance_t* av_freep(&mpi->planes[0]); if (mpi->flags & MP_IMGFLAG_RGB_PALETTE) av_freep(&mpi->planes[1]); + mpi->planes[1] = NULL; + mpi->planes[2] = NULL; + mpi->planes[3] = NULL; mpi->flags&=~MP_IMGFLAG_ALLOCATED; mpi->bpp = 0; mp_msg(MSGT_VFILTER,MSGL_V,"vf.c: have to REALLOCATE buffer memory in vf_%s :(\n",

1 0

r37800 - trunk/libmpcodecs/vd_raw.c
by reimar 25 Feb '16

25 Feb '16

Author: reimar Date: Thu Feb 25 22:34:43 2016 New Revision: 37800 Log: vd_raw: Use more-likely-correct 1-bit format. Modified: trunk/libmpcodecs/vd_raw.c Modified: trunk/libmpcodecs/vd_raw.c ============================================================================== --- trunk/libmpcodecs/vd_raw.c Thu Feb 25 19:10:01 2016 (r37799) +++ trunk/libmpcodecs/vd_raw.c Thu Feb 25 22:34:43 2016 (r37800) @@ -51,7 +51,7 @@ static int init(sh_video_t *sh){ // set format fourcc for raw RGB: if(sh->bih && sh->bih->biCompression==0){ // set based on bit depth switch(sh->bih->biBitCount){ - case 1: sh->bih->biCompression=IMGFMT_BGR1; break; + case 1: sh->bih->biCompression=IMGFMT_RGB1; break; case 4: sh->bih->biCompression=IMGFMT_BGR4; break; case 8: sh->bih->biCompression=IMGFMT_BGR8; break; case 15: sh->bih->biCompression=IMGFMT_BGR15; break;

1 0

r37799 - in trunk: etc/codecs.conf libmpcodecs/vd.c libmpdemux/aviheader.c libmpdemux/demux_lavf.c libmpdemux/stheader.h
by reimar 25 Feb '16

25 Feb '16

Author: reimar Date: Thu Feb 25 19:10:01 2016 New Revision: 37799 Log: Fix flip behaviour for RAW formats. For non-AVI raw they should not be treated as flipped by default. Also respect the flip decision by the FFmpeg demuxer even when used with our rawdec. Modified: trunk/etc/codecs.conf trunk/libmpcodecs/vd.c trunk/libmpdemux/aviheader.c trunk/libmpdemux/demux_lavf.c trunk/libmpdemux/stheader.h Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Feb 25 18:09:25 2016 (r37798) +++ trunk/etc/codecs.conf Thu Feb 25 19:10:01 2016 (r37799) @@ -4258,13 +4258,6 @@ videocodec rawbgr15 format 0x4247520F out BGR15 -videocodec rawbgr8flip - info "RAW BGR8" - status working - driver raw - format 0x0 - out BGR8 flip - videocodec rawbgr8 info "RAW BGR8" status working @@ -4281,7 +4274,7 @@ videocodec rawbgr1 format 0x0 format 0x20776172 0x42475201 format 0x42475201 - out BGR1 flip + out BGR1 videocodec ffrawpal info "RAW PAL8" @@ -4293,7 +4286,7 @@ videocodec ffrawpal format 0x20776172 0x42475204 format 0x42475204 format 0x42475202 - out BGR8 flip + out BGR8 videocodec rawyuy2 info "RAW YUY2" Modified: trunk/libmpcodecs/vd.c ============================================================================== --- trunk/libmpcodecs/vd.c Thu Feb 25 18:09:25 2016 (r37798) +++ trunk/libmpcodecs/vd.c Thu Feb 25 19:10:01 2016 (r37799) @@ -289,6 +289,7 @@ int mpcodecs_config_vo(sh_video_t *sh, i } if (vo_flags & VFCAP_FLIPPED) flip ^= 1; + flip ^= sh->flipped_input; if (flip && !(vo_flags & VFCAP_FLIP)) { // we need to flip, but no flipping filter avail. vf_add_before_vo(&vf, "flip", NULL); Modified: trunk/libmpdemux/aviheader.c ============================================================================== --- trunk/libmpdemux/aviheader.c Thu Feb 25 18:09:25 2016 (r37798) +++ trunk/libmpdemux/aviheader.c Thu Feb 25 19:10:01 2016 (r37799) @@ -284,6 +284,9 @@ while(1){ sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; sh_video->format = sh_video->bih->biCompression; + if (sh_video->bih->biCompression == 0 && sh_video->bih->biHeight > 0) + sh_video->flipped_input ^= 1; + sh_video->bih->biHeight = FFABS(sh_video->bih->biHeight); // if(demuxer->video->id==-1) demuxer->video->id=stream_id; // IdxFix: idxfix_videostream=stream_id; Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Thu Feb 25 18:09:25 2016 (r37798) +++ trunk/libmpdemux/demux_lavf.c Thu Feb 25 19:10:01 2016 (r37799) @@ -367,6 +367,12 @@ static void handle_stream(demuxer_t *dem if(!sh_video) break; stream_type = "video"; priv->vstreams[priv->video_streams] = i; + if (codec->extradata_size >= 9 && + !memcmp(codec->extradata + codec->extradata_size - 9, "BottomUp", 9)) + { + codec->extradata_size -= 9; + sh_video->flipped_input ^= 1; + } // always reserve space for palette sh_video->bih_size = sizeof(*bih) + codec->extradata_size + 1024; bih=calloc(sh_video->bih_size,1); Modified: trunk/libmpdemux/stheader.h ============================================================================== --- trunk/libmpdemux/stheader.h Thu Feb 25 18:09:25 2016 (r37798) +++ trunk/libmpdemux/stheader.h Thu Feb 25 19:10:01 2016 (r37799) @@ -111,6 +111,7 @@ typedef struct sh_video { float stream_aspect; // aspect ratio stored in the media headers (e.g. in DVD IFO files) int i_bps; // == bitrate (compressed bytes/sec) int disp_w,disp_h; // display size (filled by fileformat parser) + int flipped_input; // output driver/filters: (set by libmpcodecs core) unsigned int outfmtidx; struct vf_instance *vfilter; // the video filter chain, used for this video stream

1 0

r37798 - trunk/etc/codecs.conf
by reimar 25 Feb '16

25 Feb '16

Author: reimar Date: Thu Feb 25 18:09:25 2016 New Revision: 37798 Log: codecs.conf: add ffmpeg rawdec for paletted formats. Will be used for the variants not supported by our raw decoder, like 4 and 2 bit paletted. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Feb 25 18:09:23 2016 (r37797) +++ trunk/etc/codecs.conf Thu Feb 25 18:09:25 2016 (r37798) @@ -4283,6 +4283,18 @@ videocodec rawbgr1 format 0x42475201 out BGR1 flip +videocodec ffrawpal + info "RAW PAL8" + comment "For decoding paletted 2 and 4 bit formats" + status working + driver ffmpeg + dll rawvideo + format 0x0 + format 0x20776172 0x42475204 + format 0x42475204 + format 0x42475202 + out BGR8 flip + videocodec rawyuy2 info "RAW YUY2" status working

1 0

r37797 - trunk/libmpdemux/demux_lavf.c
by reimar 25 Feb '16

25 Feb '16

Author: reimar Date: Thu Feb 25 18:09:23 2016 New Revision: 37797 Log: demux_lavf: improve raw format handling. Override the raw[32] codec that to 0 to get standard AVI autodetect behaviour also for MOV. Also ensure that palette is always exported in sh->bih in addition. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Thu Feb 25 18:09:22 2016 (r37796) +++ trunk/libmpdemux/demux_lavf.c Thu Feb 25 18:09:23 2016 (r37797) @@ -367,9 +367,14 @@ static void handle_stream(demuxer_t *dem if(!sh_video) break; stream_type = "video"; priv->vstreams[priv->video_streams] = i; - bih=calloc(sizeof(*bih) + codec->extradata_size,1); + // always reserve space for palette + sh_video->bih_size = sizeof(*bih) + codec->extradata_size + 1024; + bih=calloc(sh_video->bih_size,1); if (codec->codec_id == AV_CODEC_ID_RAWVIDEO) { + if (codec->bits_per_coded_sample && codec->bits_per_coded_sample > 0 && + codec->codec_tag == MKTAG('r', 'a', 'w', 32)) + codec->codec_tag = 0; switch (codec->pix_fmt) { case AV_PIX_FMT_RGB24: codec->codec_tag= MKTAG(24, 'B', 'G', 'R'); @@ -575,6 +580,7 @@ static demuxer_t* demux_open_lavf(demuxe avfc->pb = priv->pb; } + av_dict_set(&opts, "fflags", "+keepside", 0); if(avformat_open_input(&avfc, mp_filename, priv->avif, &opts)<0){ mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n"); return NULL; @@ -671,11 +677,19 @@ static int demux_lavf_fill_buffer(demuxe } } else if(id==demux->video->id){ // video + sh_video_t *sh; ds=demux->video; if(!ds->sh){ ds->sh=demux->v_streams[id]; mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id); } + sh = ds->sh; + if (sh && sh->bih) { + int size = 0; + const uint8_t *pal = av_packet_get_side_data(&pkt, AV_PKT_DATA_PALETTE, &size); + if (pal && size) + memcpy(((uint8_t *)sh->bih) + sh->bih->biSize, pal, FFMIN(size, 1024)); + } } else if(id==demux->sub->id){ // subtitle ds=demux->sub; @@ -685,6 +699,7 @@ static int demux_lavf_fill_buffer(demuxe return 1; } + av_packet_merge_side_data(&pkt); dp=new_demux_packet(pkt.size); memcpy(dp->buffer, pkt.data, pkt.size); av_free_packet(&pkt);

1 0

r37796 - trunk/libmpcodecs/vd_raw.c
by reimar 25 Feb '16

25 Feb '16

Author: reimar Date: Thu Feb 25 18:09:22 2016 New Revision: 37796 Log: vd_raw: Fix < 8bpp formats. Ensure line stride does not become 0 and export palette also for RGB/BGR4. Modified: trunk/libmpcodecs/vd_raw.c Modified: trunk/libmpcodecs/vd_raw.c ============================================================================== --- trunk/libmpcodecs/vd_raw.c Thu Feb 25 13:16:08 2016 (r37795) +++ trunk/libmpcodecs/vd_raw.c Thu Feb 25 18:09:22 2016 (r37796) @@ -109,10 +109,11 @@ static mp_image_t* decode(sh_video_t *sh } } else { mpi->planes[0]=data; - mpi->stride[0]=mpi->width*(mpi->bpp/8); + mpi->stride[0]=(mpi->width*mpi->bpp + 7)/8; // .AVI files has uncompressed lines 4-byte aligned: if(sh->format==0 || sh->format==3) mpi->stride[0]=(mpi->stride[0]+3)&(~3); - if(mpi->imgfmt==IMGFMT_RGB8 || mpi->imgfmt==IMGFMT_BGR8){ + if(mpi->imgfmt==IMGFMT_RGB8 || mpi->imgfmt==IMGFMT_BGR8 || + mpi->imgfmt==IMGFMT_RGB4 || mpi->imgfmt==IMGFMT_BGR4){ // export palette: mpi->planes[1]=sh->bih ? (unsigned char*)(sh->bih+1) : NULL; #if 0

1 0