[libav-devel] [PATCH 051/264] pcm: switch to codecpar

[Anton Khirnov]

---
 libavformat/pcm.c    |  8 ++++----
 libavformat/pcmdec.c | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/libavformat/pcm.c b/libavformat/pcm.c
index e4f2a5e..c506edd 100644
--- a/libavformat/pcm.c
+++ b/libavformat/pcm.c
@@ -33,10 +33,10 @@ int ff_pcm_read_seek(AVFormatContext *s,
 
     st = s->streams[0];
 
-    block_align = st->codec->block_align ? st->codec->block_align :
-        (av_get_bits_per_sample(st->codec->codec_id) * st->codec->channels) >> 
3;
-    byte_rate = st->codec->bit_rate ? st->codec->bit_rate >> 3 :
-        block_align * st->codec->sample_rate;
+    block_align = st->codecpar->block_align ? st->codecpar->block_align :
+        (av_get_bits_per_sample(st->codecpar->codec_id) * 
st->codecpar->channels) >> 3;
+    byte_rate = st->codecpar->bit_rate ? st->codecpar->bit_rate >> 3 :
+        block_align * st->codecpar->sample_rate;
 
     if (block_align <= 0 || byte_rate <= 0)
         return -1;
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index 1bbbc66..69789b6 100644
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -43,20 +43,20 @@ static int pcm_read_header(AVFormatContext *s)
         return AVERROR(ENOMEM);
 
 
-    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id    = s->iformat->raw_codec_id;
-    st->codec->sample_rate = s1->sample_rate;
-    st->codec->channels    = s1->channels;
+    st->codecpar->codec_type  = AVMEDIA_TYPE_AUDIO;
+    st->codecpar->codec_id    = s->iformat->raw_codec_id;
+    st->codecpar->sample_rate = s1->sample_rate;
+    st->codecpar->channels    = s1->channels;
 
-    st->codec->bits_per_coded_sample =
-        av_get_bits_per_sample(st->codec->codec_id);
+    st->codecpar->bits_per_coded_sample =
+        av_get_bits_per_sample(st->codecpar->codec_id);
 
-    assert(st->codec->bits_per_coded_sample > 0);
+    assert(st->codecpar->bits_per_coded_sample > 0);
 
-    st->codec->block_align =
-        st->codec->bits_per_coded_sample * st->codec->channels / 8;
+    st->codecpar->block_align =
+        st->codecpar->bits_per_coded_sample * st->codecpar->channels / 8;
 
-    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+    avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
     return 0;
 }
 
@@ -65,7 +65,7 @@ static int pcm_read_packet(AVFormatContext *s, AVPacket *pkt)
     int ret, size, bps;
     //    AVStream *st = s->streams[0];
 
-    size= RAW_SAMPLES*s->streams[0]->codec->block_align;
+    size= RAW_SAMPLES*s->streams[0]->codecpar->block_align;
 
     ret= av_get_packet(s->pb, pkt, size);
 
@@ -73,14 +73,14 @@ static int pcm_read_packet(AVFormatContext *s, AVPacket 
*pkt)
     if (ret < 0)
         return ret;
 
-    bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id);
+    bps= av_get_bits_per_sample(s->streams[0]->codecpar->codec_id);
     if (!bps) {
         av_log(s, AV_LOG_ERROR, "Unknown number of bytes per sample.\n");
         return AVERROR(EINVAL);
     }
 
     pkt->dts=
-    pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels);
+    pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codecpar->channels);
 
     return ret;
 }
-- 
2.0.0

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel