virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

avformat/mov: make MOVStreamContext refcounted

Browse Source 
This will be useful in the next commit.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2024-02-06 10:05:17 -03:00
parent ce7b519ab7
commit 9ba327e70f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/isom.h
View File

@ -166,6 +166,7 @@ typedef struct MOVIndexRange {
typedef struct MOVStreamContext { typedef struct MOVStreamContext {
AVIOContext *pb; AVIOContext *pb;
int refcount;
int pb_is_copied; int pb_is_copied;
int ffindex; ///< AVStream index int ffindex; ///< AVStream index
int next_chunk; int next_chunk;

7
libavformat/mov.c
View File

@ -212,6 +212,7 @@ static int mov_read_covr(MOVContext *c, AVIOContext *pb, int type, int len)
} }
st = c->fc->streams[c->fc->nb_streams - 1]; st = c->fc->streams[c->fc->nb_streams - 1];
st->priv_data = sc; st->priv_data = sc;
sc->refcount = 1;
if (st->attached_pic.size >= 8 && id != AV_CODEC_ID_BMP) { if (st->attached_pic.size >= 8 && id != AV_CODEC_ID_BMP) {
if (AV_RB64(st->attached_pic.data) == 0x89504e470d0a1a0a) { if (AV_RB64(st->attached_pic.data) == 0x89504e470d0a1a0a) {
@ -4622,6 +4623,7 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom)
st->codecpar->codec_type = AVMEDIA_TYPE_DATA; st->codecpar->codec_type = AVMEDIA_TYPE_DATA;
sc->ffindex = st->index; sc->ffindex = st->index;
c->trak_index = st->index; c->trak_index = st->index;
sc->refcount = 1;
if ((ret = mov_read_default(c, pb, atom)) < 0) if ((ret = mov_read_default(c, pb, atom)) < 0)
return ret; return ret;
@ -4909,6 +4911,7 @@ static int heif_add_stream(MOVContext *c, HEIFItem *item)
sc = st->priv_data; sc = st->priv_data;
sc->pb = c->fc->pb; sc->pb = c->fc->pb;
sc->pb_is_copied = 1; sc->pb_is_copied = 1;
sc->refcount = 1;
// Populate the necessary fields used by mov_build_index. // Populate the necessary fields used by mov_build_index.
sc->stsc_count = 1; sc->stsc_count = 1;
@ -8610,8 +8613,10 @@ static void mov_free_stream_context(AVFormatContext *s, AVStream *st)
{ {
MOVStreamContext *sc = st->priv_data; MOVStreamContext *sc = st->priv_data;
if (!sc) if (!sc || --sc->refcount) {
st->priv_data = NULL;
return; return;
}
av_freep(&sc->ctts_data); av_freep(&sc->ctts_data);
for (int i = 0; i < sc->drefs_count; i++) { for (int i = 0; i < sc->drefs_count; i++) {