diff options
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/asfheader.c | 1 | ||||
-rw-r--r-- | libmpdemux/demux_ts.c | 2 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 35 | ||||
-rw-r--r-- | libmpdemux/demuxer.h | 1 |
4 files changed, 32 insertions, 7 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 186a1a967d..95d5f18e7f 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -444,6 +444,7 @@ int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){ audio_pos += 64; //16+16+4+4+4+16+4; buffer = &hdr[audio_pos]; sh_audio=new_sh_audio(demuxer,streamh->stream_no & 0x7F); + sh_audio->needs_parsing = 1; mp_tmsg(MSGT_DEMUX, MSGL_INFO, "[%s] Audio stream found, -aid %d\n", "asfheader", streamh->stream_no & 0x7F); ++audio_streams; if (!asf_init_audio_stream(demuxer, asf, sh_audio, streamh, &audio_pos, &buffer, hdr, hdr_len)) diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 264a84f77d..6b56b55ffc 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -1418,7 +1418,7 @@ static int pes_parse2(unsigned char *buf, uint16_t packet_len, ES_stream_t *es, int ssid = parse_pes_extension_fields(p, pkt_len); if((audio_substream_id!=-1) && (ssid != audio_substream_id)) return 0; - if(ssid == 0x72) + if(ssid == 0x72 && type_from_pmt != AUDIO_DTS) es->type = type_from_pmt = AUDIO_TRUEHD; } diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 78c18e7640..80d4b556b3 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -59,6 +59,7 @@ // just be removed again. #define PARSE_ON_ADD 0 +static void clear_parser(sh_common_t *sh); void resync_video_stream(sh_video_t *sh_video); void resync_audio_stream(sh_audio_t *sh_audio); @@ -284,8 +285,7 @@ static void free_sh_sub(sh_sub_t *sh) #endif free(sh->lang); #ifdef CONFIG_LIBAVCODEC - av_parser_close(sh->parser); - av_freep(&sh->avctx); + clear_parser((sh_common_t *)sh); #endif free(sh); } @@ -326,8 +326,7 @@ void free_sh_audio(demuxer_t *demuxer, int id) free(sh->codecdata); free(sh->lang); #ifdef CONFIG_LIBAVCODEC - av_parser_close(sh->parser); - av_freep(&sh->avctx); + clear_parser((sh_common_t *)sh); #endif free(sh); } @@ -359,8 +358,7 @@ void free_sh_video(sh_video_t *sh) mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh); free(sh->bih); #ifdef CONFIG_LIBAVCODEC - av_parser_close(sh->parser); - av_freep(&sh->avctx); + clear_parser((sh_common_t *)sh); #endif free(sh); } @@ -460,6 +458,9 @@ static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parse case 0x86: codec_id = CODEC_ID_DTS; break; + case MKTAG('M', 'L', 'P', ' '): + codec_id = CODEC_ID_MLP; + break; case 0x55: case 0x5500736d: case MKTAG('.', 'm', 'p', '3'): @@ -472,6 +473,9 @@ static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parse case MKTAG('.', 'm', 'p', '1'): codec_id = CODEC_ID_MP2; break; + case MKTAG('T', 'R', 'H', 'D'): + codec_id = CODEC_ID_TRUEHD; + break; } if (codec_id != CODEC_ID_NONE) { *avctx = avcodec_alloc_context(); @@ -510,6 +514,20 @@ int ds_parse(demux_stream_t *ds, uint8_t **buffer, int *len, double pts, off_t p return *len; return av_parser_parse2(parser, avctx, buffer, len, *buffer, *len, pts, pts, pos); } + +static void clear_parser(sh_common_t *sh) +{ + av_parser_close(sh->parser); + sh->parser = NULL; + av_freep(&sh->avctx); +} + +void ds_clear_parser(demux_stream_t *ds) +{ + if (!ds->sh) + return; + clear_parser(ds->sh); +} #endif void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp) @@ -1201,6 +1219,11 @@ demuxer_t *demux_open(struct MPOpts *opts, stream_t *vs, int file_format, void demux_flush(demuxer_t *demuxer) { +#if PARSE_ON_ADD + ds_clear_parser(demuxer->video); + ds_clear_parser(demuxer->audio); + ds_clear_parser(demuxer->sub); +#endif ds_free_packs(demuxer->video); ds_free_packs(demuxer->audio); ds_free_packs(demuxer->sub); diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 5da35efa03..c5499bd053 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -401,6 +401,7 @@ int ds_get_packet_pts(demux_stream_t *ds, unsigned char **start, double *pts); int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start); double ds_get_next_pts(demux_stream_t *ds); int ds_parse(demux_stream_t *sh, uint8_t **buffer, int *len, double pts, off_t pos); +void ds_clear_parser(demux_stream_t *sh); // This is defined here because demux_stream_t ins't defined in stream.h stream_t* new_ds_stream(demux_stream_t *ds); |