aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/asvenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-17 00:11:33 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-17 00:11:33 +0100
commitcc4a6435638fa2a471fef048a3e68eaf7e6e306c (patch)
tree074304931d2c5f76d97868399a5b46214fe915ce /libavcodec/asvenc.c
parent29c83d23e8edf47ce423f85d4a2f2081a674a940 (diff)
parent6139f481ac9feb1bee4e7d04789fb15d7f24ebbf (diff)
downloadffmpeg-cc4a6435638fa2a471fef048a3e68eaf7e6e306c.tar.gz
Merge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'
* commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf': asvenc: use the AVFrame API properly. a64multienc: use the AVFrame API properly. Conflicts: libavcodec/vaapi_mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/asvenc.c')
-rw-r--r--libavcodec/asvenc.c33
1 files changed, 18 insertions, 15 deletions
diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c
index 38d971abcb..066dbbab8b 100644
--- a/libavcodec/asvenc.c
+++ b/libavcodec/asvenc.c
@@ -148,14 +148,16 @@ static inline int encode_mb(ASV1Context *a, int16_t block[6][64]){
return 0;
}
-static inline void dct_get(ASV1Context *a, int mb_x, int mb_y){
+static inline void dct_get(ASV1Context *a, const AVFrame *frame,
+ int mb_x, int mb_y)
+{
int16_t (*block)[64]= a->block;
- int linesize= a->picture.linesize[0];
+ int linesize = frame->linesize[0];
int i;
- uint8_t *ptr_y = a->picture.data[0] + (mb_y * 16* linesize ) + mb_x * 16;
- uint8_t *ptr_cb = a->picture.data[1] + (mb_y * 8 * a->picture.linesize[1]) + mb_x * 8;
- uint8_t *ptr_cr = a->picture.data[2] + (mb_y * 8 * a->picture.linesize[2]) + mb_x * 8;
+ uint8_t *ptr_y = frame->data[0] + (mb_y * 16* linesize ) + mb_x * 16;
+ uint8_t *ptr_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
+ uint8_t *ptr_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
a->dsp.get_pixels(block[0], ptr_y , linesize);
a->dsp.get_pixels(block[1], ptr_y + 8, linesize);
@@ -165,8 +167,8 @@ static inline void dct_get(ASV1Context *a, int mb_x, int mb_y){
a->dsp.fdct(block[i]);
if(!(a->avctx->flags&CODEC_FLAG_GRAY)){
- a->dsp.get_pixels(block[4], ptr_cb, a->picture.linesize[1]);
- a->dsp.get_pixels(block[5], ptr_cr, a->picture.linesize[2]);
+ a->dsp.get_pixels(block[4], ptr_cb, frame->linesize[1]);
+ a->dsp.get_pixels(block[5], ptr_cr, frame->linesize[2]);
for(i=4; i<6; i++)
a->dsp.fdct(block[i]);
}
@@ -176,7 +178,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet)
{
ASV1Context * const a = avctx->priv_data;
- AVFrame * const p= &a->picture;
int size, ret;
int mb_x, mb_y;
@@ -186,13 +187,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
init_put_bits(&a->pb, pkt->data, pkt->size);
- *p = *pict;
- p->pict_type= AV_PICTURE_TYPE_I;
- p->key_frame= 1;
-
for(mb_y=0; mb_y<a->mb_height2; mb_y++){
for(mb_x=0; mb_x<a->mb_width2; mb_x++){
- dct_get(a, mb_x, mb_y);
+ dct_get(a, pict, mb_x, mb_y);
encode_mb(a, a->block);
}
}
@@ -200,7 +197,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if(a->mb_width2 != a->mb_width){
mb_x= a->mb_width2;
for(mb_y=0; mb_y<a->mb_height2; mb_y++){
- dct_get(a, mb_x, mb_y);
+ dct_get(a, pict, mb_x, mb_y);
encode_mb(a, a->block);
}
}
@@ -208,7 +205,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if(a->mb_height2 != a->mb_height){
mb_y= a->mb_height2;
for(mb_x=0; mb_x<a->mb_width; mb_x++){
- dct_get(a, mb_x, mb_y);
+ dct_get(a, pict, mb_x, mb_y);
encode_mb(a, a->block);
}
}
@@ -240,6 +237,12 @@ static av_cold int encode_init(AVCodecContext *avctx){
int i;
const int scale= avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2;
+ avctx->coded_frame = av_frame_alloc();
+ if (!avctx->coded_frame)
+ return AVERROR(ENOMEM);
+ avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+ avctx->coded_frame->key_frame = 1;
+
ff_asv_common_init(avctx);
if(avctx->global_quality == 0) avctx->global_quality= 4*FF_QUALITY_SCALE;