summaryrefslogtreecommitdiff
path: root/libavcodec/rawenc.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/rawenc.c')
-rw-r--r--libavcodec/rawenc.c31
1 files changed, 20 insertions, 11 deletions
diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c
index 60bd0c776f..d181b74570 100644
--- a/libavcodec/rawenc.c
+++ b/libavcodec/rawenc.c
@@ -2,20 +2,20 @@
* Raw Video Encoder
* Copyright (c) 2001 Fabrice Bellard
*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
*
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -39,37 +39,46 @@ static av_cold int raw_encode_init(AVCodecContext *avctx)
#if FF_API_CODED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
- avctx->coded_frame->key_frame = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
avctx->bits_per_coded_sample = av_get_bits_per_pixel(desc);
if(!avctx->codec_tag)
avctx->codec_tag = avcodec_pix_fmt_to_codec_tag(avctx->pix_fmt);
+ avctx->bit_rate = ff_guess_coded_bitrate(avctx);
+
return 0;
}
static int raw_encode(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet)
{
- int ret = av_image_get_buffer_size(avctx->pix_fmt,
- avctx->width, avctx->height, 1);
+ int ret = av_image_get_buffer_size(frame->format,
+ frame->width, frame->height, 1);
if (ret < 0)
return ret;
- if ((ret = ff_alloc_packet(pkt, ret)) < 0)
+ if ((ret = ff_alloc_packet2(avctx, pkt, ret, ret)) < 0)
return ret;
if ((ret = av_image_copy_to_buffer(pkt->data, pkt->size,
- frame->data, frame->linesize,
+ (const uint8_t **)frame->data, frame->linesize,
frame->format,
frame->width, frame->height, 1)) < 0)
return ret;
if(avctx->codec_tag == AV_RL32("yuv2") && ret > 0 &&
- avctx->pix_fmt == AV_PIX_FMT_YUYV422) {
+ frame->format == AV_PIX_FMT_YUYV422) {
int x;
- for(x = 1; x < avctx->height*avctx->width*2; x += 2)
+ for(x = 1; x < frame->height*frame->width*2; x += 2)
pkt->data[x] ^= 0x80;
+ } else if (avctx->codec_tag == AV_RL32("b64a") && ret > 0 &&
+ frame->format == AV_PIX_FMT_RGBA64BE) {
+ uint64_t v;
+ int x;
+ for (x = 0; x < frame->height * frame->width; x++) {
+ v = AV_RB64(&pkt->data[8 * x]);
+ AV_WB64(&pkt->data[8 * x], v << 48 | v >> 16);
+ }
}
pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;