* qatar/master: (58 commits) amrnbdec: check frame size before decoding. cscd: use negative error values to indicate decode_init() failures. h264: prevent overreads in intra PCM decoding. FATE: do not decode audio in the nuv test. dxa: set audio stream time base using the sample rate psx-str: do not allow seeking by bytes asfdec: Do not set AVCodecContext.frame_size vqf: set packet parameters after av_new_packet() mpegaudiodec: use DSPUtil.butterflies_float(). FATE: add mp3 test for sample that exhibited false overreads fate: add cdxl test for bit line plane arrangement vmnc: return error on decode_init() failure. libvorbis: add/update error messages libvorbis: use AVFifoBuffer for output packet buffer libvorbis: remove unneeded e_o_s check libvorbis: check return values for functions that can return errors libvorbis: use float input instead of s16 libvorbis: do not flush libvorbis analysis if dsp state was not initialized libvorbis: use VBR by default, with default quality of 3 libvorbis: fix use of minrate/maxrate AVOptions ... Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/dpxenc.c libavcodec/libvorbis.c libavcodec/vmnc.c libavformat/asfdec.c libavformat/id3v2enc.c libavformat/internal.h libavformat/mp3enc.c libavformat/utils.c libavformat/version.h libswscale/utils.c tests/fate/video.mak tests/ref/fate/nuv tests/ref/fate/prores-alpha tests/ref/lavf/ffm tests/ref/vsynth1/prores tests/ref/vsynth2/prores Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			73 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			73 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * RV10 encoder
 | |
|  * Copyright (c) 2000,2001 Fabrice Bellard
 | |
|  * Copyright (c) 2002-2004 Michael Niedermayer
 | |
|  *
 | |
|  * This file is part of FFmpeg.
 | |
|  *
 | |
|  * 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.
 | |
|  *
 | |
|  * 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 FFmpeg; if not, write to the Free Software
 | |
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | |
|  */
 | |
| 
 | |
| /**
 | |
|  * @file
 | |
|  * RV10 encoder
 | |
|  */
 | |
| 
 | |
| #include "mpegvideo.h"
 | |
| #include "put_bits.h"
 | |
| 
 | |
| void ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number)
 | |
| {
 | |
|     int full_frame= 0;
 | |
| 
 | |
|     avpriv_align_put_bits(&s->pb);
 | |
| 
 | |
|     put_bits(&s->pb, 1, 1);     /* marker */
 | |
| 
 | |
|     put_bits(&s->pb, 1, (s->pict_type == AV_PICTURE_TYPE_P));
 | |
| 
 | |
|     put_bits(&s->pb, 1, 0);     /* not PB frame */
 | |
| 
 | |
|     put_bits(&s->pb, 5, s->qscale);
 | |
| 
 | |
|     if (s->pict_type == AV_PICTURE_TYPE_I) {
 | |
|         /* specific MPEG like DC coding not used */
 | |
|     }
 | |
|     /* if multiple packets per frame are sent, the position at which
 | |
|        to display the macroblocks is coded here */
 | |
|     if(!full_frame){
 | |
|         put_bits(&s->pb, 6, 0); /* mb_x */
 | |
|         put_bits(&s->pb, 6, 0); /* mb_y */
 | |
|         put_bits(&s->pb, 12, s->mb_width * s->mb_height);
 | |
|     }
 | |
| 
 | |
|     put_bits(&s->pb, 3, 0);     /* ignored */
 | |
| }
 | |
| 
 | |
| FF_MPV_GENERIC_CLASS(rv10)
 | |
| 
 | |
| AVCodec ff_rv10_encoder = {
 | |
|     .name           = "rv10",
 | |
|     .type           = AVMEDIA_TYPE_VIDEO,
 | |
|     .id             = CODEC_ID_RV10,
 | |
|     .priv_data_size = sizeof(MpegEncContext),
 | |
|     .init           = ff_MPV_encode_init,
 | |
|     .encode2        = ff_MPV_encode_picture,
 | |
|     .close          = ff_MPV_encode_end,
 | |
|     .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
 | |
|     .long_name= NULL_IF_CONFIG_SMALL("RealVideo 1.0"),
 | |
|     .priv_class     = &rv10_class,
 | |
| };
 |