diff mbox series

[FFmpeg-devel,v6,2/7] avformat/apm: use the entire APMState structure as extradata

Message ID 20200708125433.238118-3-zane@zanevaniperen.com
State Accepted
Commit 1b0a0da63a279804df04292cf452b2acdd87b687
Headers show
Series Add support for encoding adpcm_ima_apm and muxing to apm. | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Zane van Iperen July 8, 2020, 12:55 p.m. UTC 
Is the "actual" codec extradata instead of the hand-crafted one
from the previous revision.

Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
---
 libavformat/apm.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/apm.c b/libavformat/apm.c
index 4158b81457..8d655d0a33 100644
--- a/libavformat/apm.c
+++ b/libavformat/apm.c
@@ -26,6 +26,7 @@ 
 
 #define APM_FILE_HEADER_SIZE    18
 #define APM_FILE_EXTRADATA_SIZE 80
+#define APM_EXTRADATA_SIZE      28
 
 #define APM_MAX_READ_SIZE       4096
 
@@ -160,13 +161,11 @@  static int apm_read_header(AVFormatContext *s)
         return AVERROR_PATCHWELCOME;
     }
 
-    if ((ret = ff_alloc_extradata(st->codecpar, 16)) < 0)
+    if ((ret = ff_alloc_extradata(st->codecpar, APM_EXTRADATA_SIZE)) < 0)
         return ret;
 
-    AV_WL32(st->codecpar->extradata +  0, vs12.state.predictor_l);
-    AV_WL32(st->codecpar->extradata +  4, vs12.state.step_index_l);
-    AV_WL32(st->codecpar->extradata +  8, vs12.state.predictor_r);
-    AV_WL32(st->codecpar->extradata + 12, vs12.state.step_index_r);
+    /* Use the entire state as extradata. */
+    memcpy(st->codecpar->extradata, buf + 20, APM_EXTRADATA_SIZE);
 
     avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
     st->start_time  = 0;