Originally committed as revision 20914 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -46,6 +46,7 @@ version <next>: · 45 unmodified lines | |||
| 46 | - IV8 demuxer | 46 | - IV8 demuxer |
| 47 | - CDG demuxer and decoder | 47 | - CDG demuxer and decoder |
| 48 | - R210 decoder | 48 | - R210 decoder |
| 49 | - Auravision Aura decoder | ||
| 49 | 50 | ||
| 50 | 51 | ||
| 51 | 52 | ||
| @@ -317,6 +317,7 @@ following image formats are supported: · 316 unmodified lines | |||
| 317 | @tab fourcc: VCR1 | 317 | @tab fourcc: VCR1 |
| 318 | @item ATI VCR2 @tab @tab X | 318 | @item ATI VCR2 @tab @tab X |
| 319 | @tab fourcc: VCR2 | 319 | @tab fourcc: VCR2 |
| 320 | @item Auravision Aura @tab @tab X | ||
| 320 | @item Autodesk Animator Flic video @tab @tab X | 321 | @item Autodesk Animator Flic video @tab @tab X |
| 321 | @item Autodesk RLE @tab @tab X | 322 | @item Autodesk RLE @tab @tab X |
| 322 | @tab fourcc: AASC | 323 | @tab fourcc: AASC |
| @@ -60,6 +60,7 @@ OBJS-$(CONFIG_ASV2_DECODER) += asv1.o mpeg12data.o · 59 unmodified lines | |||
| 60 | OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o mpeg12data.o | 60 | OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o mpeg12data.o |
| 61 | OBJS-$(CONFIG_ATRAC1_DECODER) += atrac1.o atrac.o | 61 | OBJS-$(CONFIG_ATRAC1_DECODER) += atrac1.o atrac.o |
| 62 | OBJS-$(CONFIG_ATRAC3_DECODER) += atrac3.o atrac.o | 62 | OBJS-$(CONFIG_ATRAC3_DECODER) += atrac3.o atrac.o |
| 63 | OBJS-$(CONFIG_AURA_DECODER) += cyuv.o | ||
| 63 | OBJS-$(CONFIG_AVS_DECODER) += avs.o | 64 | OBJS-$(CONFIG_AVS_DECODER) += avs.o |
| 64 | OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o | 65 | OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o |
| 65 | OBJS-$(CONFIG_BFI_DECODER) += bfi.o | 66 | OBJS-$(CONFIG_BFI_DECODER) += bfi.o |
| @@ -65,6 +65,7 @@ void avcodec_register_all(void) · 64 unmodified lines | |||
| 65 | REGISTER_DECODER (AMV, amv); | 65 | REGISTER_DECODER (AMV, amv); |
| 66 | REGISTER_ENCDEC (ASV1, asv1); | 66 | REGISTER_ENCDEC (ASV1, asv1); |
| 67 | REGISTER_ENCDEC (ASV2, asv2); | 67 | REGISTER_ENCDEC (ASV2, asv2); |
| 68 | REGISTER_DECODER (AURA, aura); | ||
| 68 | REGISTER_DECODER (AVS, avs); | 69 | REGISTER_DECODER (AVS, avs); |
| 69 | REGISTER_DECODER (BETHSOFTVID, bethsoftvid); | 70 | REGISTER_DECODER (BETHSOFTVID, bethsoftvid); |
| 70 | REGISTER_DECODER (BFI, bfi); | 71 | REGISTER_DECODER (BFI, bfi); |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | |||
| 30 | #include "libavutil/avutil.h" | 30 | #include "libavutil/avutil.h" |
| 31 | 31 | ||
| 32 | #define LIBAVCODEC_VERSION_MAJOR 52 | 32 | #define LIBAVCODEC_VERSION_MAJOR 52 |
| 33 | #define LIBAVCODEC_VERSION_MINOR 43 | 33 | #define LIBAVCODEC_VERSION_MINOR 44 |
| 34 | #define LIBAVCODEC_VERSION_MICRO 0 | 34 | #define LIBAVCODEC_VERSION_MICRO 0 |
| 35 | 35 | ||
| 36 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | 36 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
| @@ -82,6 +82,10 @@ static int cyuv_decode_frame(AVCodecContext *avctx, · 81 unmodified lines | |||
| 82 | unsigned char cur_byte; | 82 | unsigned char cur_byte; |
| 83 | int pixel_groups; | 83 | int pixel_groups; |
| 84 | 84 | ||
| 85 | if (avctx->codec_id == CODEC_ID_AURA) { | ||
| 86 | y_table = u_table; | ||
| 87 | u_table = v_table; | ||
| 88 | } | ||
| 85 | /* sanity check the buffer size: A buffer has 3x16-bytes tables | 89 | /* sanity check the buffer size: A buffer has 3x16-bytes tables |
| 86 | * followed by (height) lines each with 3 bytes to represent groups | 90 | * followed by (height) lines each with 3 bytes to represent groups |
| 87 | * of 4 pixels. Thus, the total size of the buffer ought to be: | 91 | * of 4 pixels. Thus, the total size of the buffer ought to be: |
| @@ -163,6 +167,23 @@ static int cyuv_decode_frame(AVCodecContext *avctx, · 75 unmodified lines | |||
| 163 | return buf_size; | 167 | return buf_size; |
| 164 | } | 168 | } |
| 165 | 169 | ||
| 170 | #if CONFIG_AURA_DECODER | ||
| 171 | AVCodec aura_decoder = { | ||
| 172 | "aura", | ||
| 173 | CODEC_TYPE_VIDEO, | ||
| 174 | CODEC_ID_AURA, | ||
| 175 | sizeof(CyuvDecodeContext), | ||
| 176 | cyuv_decode_init, | ||
| 177 | NULL, | ||
| 178 | NULL, | ||
| 179 | cyuv_decode_frame, | ||
| 180 | CODEC_CAP_DR1, | ||
| 181 | NULL, | ||
| 182 | .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"), | ||
| 183 | }; | ||
| 184 | #endif | ||
| 185 | |||
| 186 | #if CONFIG_CYUV_DECODER | ||
| 166 | AVCodec cyuv_decoder = { | 187 | AVCodec cyuv_decoder = { |
| 167 | "cyuv", | 188 | "cyuv", |
| 168 | CODEC_TYPE_VIDEO, | 189 | CODEC_TYPE_VIDEO, |
| @@ -176,4 +197,4 @@ AVCodec cyuv_decoder = { · 7 unmodified lines | |||
| 176 | NULL, | 197 | NULL, |
| 177 | .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), | 198 | .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), |
| 178 | }; | 199 | }; |
| 179 | 200 | #endif | |