apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-31 12:36:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

avformat: Allocate duration_error separately

Browse Source 
This significantly reduces the memory needed per AVStream when the
array is not needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-23 22:25:49 +01:00
parent 285485ac5f
commit 82d79289db
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avformat.h
View File

@@ -754,7 +754,7 @@ typedef struct AVStream {
int64_t last_dts; int64_t last_dts;
int64_t duration_gcd; int64_t duration_gcd;
int duration_count; int duration_count;
double duration_error[2][2][MAX_STD_TIMEBASES]; double (*duration_error)[2][MAX_STD_TIMEBASES];
int64_t codec_info_duration; int64_t codec_info_duration;
int64_t codec_info_duration_fields; int64_t codec_info_duration_fields;
int found_decoder; int found_decoder;

2
libavformat/avidec.c
View File

@@ -484,6 +484,8 @@ static int avi_read_header(AVFormatContext *s)
ast = s->streams[0]->priv_data; ast = s->streams[0]->priv_data;
av_freep(&s->streams[0]->codec->extradata); av_freep(&s->streams[0]->codec->extradata);
av_freep(&s->streams[0]->codec); av_freep(&s->streams[0]->codec);
if (s->streams[0]->info)
av_freep(&s->streams[0]->info->duration_error);
av_freep(&s->streams[0]->info); av_freep(&s->streams[0]->info);
av_freep(&s->streams[0]); av_freep(&s->streams[0]);
s->nb_streams = 0; s->nb_streams = 0;

12
libavformat/utils.c
View File

@@ -2891,9 +2891,12 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
double dts= (is_relative(pkt->dts) ? pkt->dts - RELATIVE_TS_BASE : pkt->dts) * av_q2d(st->time_base); double dts= (is_relative(pkt->dts) ? pkt->dts - RELATIVE_TS_BASE : pkt->dts) * av_q2d(st->time_base);
int64_t duration= pkt->dts - last; int64_t duration= pkt->dts - last;
if (!st->info->duration_error)
st->info->duration_error = av_mallocz(sizeof(st->info->duration_error[0])*2);
// if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO) // if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
// av_log(NULL, AV_LOG_ERROR, "%f\n", dts); // av_log(NULL, AV_LOG_ERROR, "%f\n", dts);
for (i=0; i<FF_ARRAY_ELEMS(st->info->duration_error[0][0]); i++) { for (i=0; i<MAX_STD_TIMEBASES; i++) {
int framerate= get_std_framerate(i); int framerate= get_std_framerate(i);
double sdts= dts*framerate/(1001*12); double sdts= dts*framerate/(1001*12);
for(j=0; j<2; j++){ for(j=0; j<2; j++){
@@ -3026,7 +3029,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
int num = 0; int num = 0;
double best_error= 0.01; double best_error= 0.01;
for (j=0; j<FF_ARRAY_ELEMS(st->info->duration_error[0][0]); j++) { for (j=0; j<MAX_STD_TIMEBASES; j++) {
int k; int k;
if(st->info->codec_info_duration && st->info->codec_info_duration*av_q2d(st->time_base) < (1001*12.0)/get_std_framerate(j)) if(st->info->codec_info_duration && st->info->codec_info_duration*av_q2d(st->time_base) < (1001*12.0)/get_std_framerate(j))
@@ -3087,8 +3090,11 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
find_stream_info_err: find_stream_info_err:
for (i=0; i < ic->nb_streams; i++) { for (i=0; i < ic->nb_streams; i++) {
st = ic->streams[i];
if (ic->streams[i]->codec) if (ic->streams[i]->codec)
ic->streams[i]->codec->thread_count = 0; ic->streams[i]->codec->thread_count = 0;
if (st->info)
av_freep(&st->info->duration_error);
av_freep(&ic->streams[i]->info); av_freep(&ic->streams[i]->info);
} }
if(ic->pb) if(ic->pb)
@@ -3208,6 +3214,8 @@ void ff_free_stream(AVFormatContext *s, AVStream *st){
av_freep(&st->codec->subtitle_header); av_freep(&st->codec->subtitle_header);
av_freep(&st->codec); av_freep(&st->codec);
av_freep(&st->priv_data); av_freep(&st->priv_data);
if (st->info)
av_freep(&st->info->duration_error);
av_freep(&st->info); av_freep(&st->info);
av_freep(&st->probe_data.buf); av_freep(&st->probe_data.buf);
av_freep(&s->streams[ --s->nb_streams ]); av_freep(&s->streams[ --s->nb_streams ]);