Mercurial > libavcodec.hg

comparison avcodec.h @ 573:b0f52172f4c5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
beos/mov/adpcm patch by Franois Revol <revol at free dot fr> * Some BeOS fixes: - errno stuff - nanosleep() replacement - added a doc/README.beos * mov reader still has problems with most videos (skips many chunks), - It should now read .mov files with zlib-compressed moov headers (aka cmov) - added SVQ1 support. - removed mapping 'raw ' and 'yuv2' to h263, was my mistake. - added IMA4 support. (tested) - fixed frame rate (it reported 0 fps or something before) - extended file probing ('wide' and 'free' atoms) - improved .mov/.mp4 detection (or so I think) * adpcm * added zlib support, with header file and lib check
author michaelni
date Sat, 20 Jul 2002 20:05:50 +0000
parents 762c67fd4078
children 8adda0af04e2
comparison
equal deleted inserted replaced
572:5a06c3552026 573:b0f52172f4c5
3 3
4 #include "common.h" 4 #include "common.h"
5 5
6 #define LIBAVCODEC_VERSION_INT 0x000406 6 #define LIBAVCODEC_VERSION_INT 0x000406
7 #define LIBAVCODEC_VERSION "0.4.6" 7 #define LIBAVCODEC_VERSION "0.4.6"
8 #define LIBAVCODEC_BUILD 4617 8 #define LIBAVCODEC_BUILD 4618
9 #define LIBAVCODEC_BUILD_STR "4617" 9 #define LIBAVCODEC_BUILD_STR "4618"
10 10
11 enum CodecID { 11 enum CodecID {
12 CODEC_ID_NONE, 12 CODEC_ID_NONE,
13 CODEC_ID_MPEG1VIDEO, 13 CODEC_ID_MPEG1VIDEO,
14 CODEC_ID_H263, 14 CODEC_ID_H263,
35 CODEC_ID_PCM_U16BE, 35 CODEC_ID_PCM_U16BE,
36 CODEC_ID_PCM_S8, 36 CODEC_ID_PCM_S8,
37 CODEC_ID_PCM_U8, 37 CODEC_ID_PCM_U8,
38 CODEC_ID_PCM_MULAW, 38 CODEC_ID_PCM_MULAW,
39 CODEC_ID_PCM_ALAW, 39 CODEC_ID_PCM_ALAW,
40
41 /* various adpcm codecs */
42 CODEC_ID_ADPCM_IMA_QT,
43 CODEC_ID_ADPCM_IMA_WAV,
44 CODEC_ID_ADPCM_MS,
40 }; 45 };
41 #define CODEC_ID_MSMPEG4 CODEC_ID_MSMPEG4V3 46 #define CODEC_ID_MSMPEG4 CODEC_ID_MSMPEG4V3
42 47
43 enum CodecType { 48 enum CodecType {
44 CODEC_TYPE_UNKNOWN = -1, 49 CODEC_TYPE_UNKNOWN = -1,
261 void (*get_buffer_callback)(struct AVCodecContext *c, int width, int height, int pict_type); 266 void (*get_buffer_callback)(struct AVCodecContext *c, int width, int height, int pict_type);
262 267
263 int has_b_frames; // is 1 if the decoded stream contains b frames 268 int has_b_frames; // is 1 if the decoded stream contains b frames
264 int dr_uvstride; 269 int dr_uvstride;
265 int dr_ip_buffer_count; 270 int dr_ip_buffer_count;
271 int block_align; /* currently only for adpcm codec in wav/avi */
266 272
267 //FIXME this should be reordered after kabis API is finished ... 273 //FIXME this should be reordered after kabis API is finished ...
268 /* 274 /*
269 Note: Below are located reserved fields for further usage 275 Note: Below are located reserved fields for further usage
270 It requires for ABI !!! 276 It requires for ABI !!!
284 *ptr_res6; 290 *ptr_res6;
285 unsigned long int 291 unsigned long int
286 ul_res0,ul_res1,ul_res2,ul_res3,ul_res4,ul_res5, 292 ul_res0,ul_res1,ul_res2,ul_res3,ul_res4,ul_res5,
287 ul_res6,ul_res7,ul_res8,ul_res9,ul_res10,ul_res11,ul_res12; 293 ul_res6,ul_res7,ul_res8,ul_res9,ul_res10,ul_res11,ul_res12;
288 unsigned int 294 unsigned int
289 ui_res0,ui_res1,ui_res2; 295 ui_res0,ui_res1;
290 unsigned short int 296 unsigned short int
291 us_res0,us_res1,us_res2,us_res3,us_res4,us_res5, 297 us_res0,us_res1,us_res2,us_res3,us_res4,us_res5,
292 us_res6,us_res7,us_res8,us_res9,us_res10,us_res11,us_res12; 298 us_res6,us_res7,us_res8,us_res9,us_res10,us_res11,us_res12;
293 unsigned char 299 unsigned char
294 uc_res0,uc_res1,uc_res2,uc_res3,uc_res4,uc_res5, 300 uc_res0,uc_res1,uc_res2,uc_res3,uc_res4,uc_res5,
374 PCM_CODEC(CODEC_ID_PCM_S8, pcm_s8); 380 PCM_CODEC(CODEC_ID_PCM_S8, pcm_s8);
375 PCM_CODEC(CODEC_ID_PCM_U8, pcm_u8); 381 PCM_CODEC(CODEC_ID_PCM_U8, pcm_u8);
376 PCM_CODEC(CODEC_ID_PCM_ALAW, pcm_alaw); 382 PCM_CODEC(CODEC_ID_PCM_ALAW, pcm_alaw);
377 PCM_CODEC(CODEC_ID_PCM_MULAW, pcm_mulaw); 383 PCM_CODEC(CODEC_ID_PCM_MULAW, pcm_mulaw);
378 384
385 /* adpcm codecs */
386
387 PCM_CODEC(CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt);
388 PCM_CODEC(CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav);
389 PCM_CODEC(CODEC_ID_ADPCM_MS, adpcm_ms);
390
379 #undef PCM_CODEC 391 #undef PCM_CODEC
380 392
381 /* dummy raw video codec */ 393 /* dummy raw video codec */
382 extern AVCodec rawvideo_codec; 394 extern AVCodec rawvideo_codec;
383 395