diff options
Diffstat (limited to 'libavcodec/utvideo.h')
| -rw-r--r-- | libavcodec/utvideo.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/libavcodec/utvideo.h b/libavcodec/utvideo.h index 2fa2b7cb93..cf0bb28c44 100644 --- a/libavcodec/utvideo.h +++ b/libavcodec/utvideo.h @@ -2,20 +2,20 @@ * Common Ut Video header * Copyright (c) 2011 Konstantin Shishkov * - * 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 */ @@ -30,8 +30,9 @@ #include "libavutil/common.h" #include "avcodec.h" #include "bswapdsp.h" -#include "huffyuvdsp.h" -#include "huffyuvencdsp.h" +#include "utvideodsp.h" +#include "lossless_videodsp.h" +#include "lossless_videoencdsp.h" enum { PRED_NONE = 0, @@ -57,32 +58,37 @@ enum { UTVIDEO_RGBA = MKTAG(0x00, 0x00, 0x02, 0x18), UTVIDEO_420 = MKTAG('Y', 'V', '1', '2'), UTVIDEO_422 = MKTAG('Y', 'U', 'Y', '2'), + UTVIDEO_444 = MKTAG('Y', 'V', '2', '4'), }; /* Mapping of libavcodec prediction modes to Ut Video's */ extern const int ff_ut_pred_order[5]; -/* Order of RGB(A) planes in Ut Video */ -extern const int ff_ut_rgb_order[4]; - typedef struct UtvideoContext { const AVClass *class; AVCodecContext *avctx; + UTVideoDSPContext utdsp; BswapDSPContext bdsp; - HuffYUVDSPContext hdspdec; - HuffYUVEncDSPContext hdsp; + LLVidDSPContext llviddsp; + LLVidEncDSPContext llvidencdsp; - uint32_t frame_info_size, flags, frame_info; + uint32_t frame_info_size, flags, frame_info, offset; int planes; int slices; int compression; int interlaced; int frame_pred; int pro; + int pack; ptrdiff_t slice_stride; uint8_t *slice_bits, *slice_buffer[4]; int slice_bits_size; + + const uint8_t *packed_stream[4][256]; + size_t packed_stream_size[4][256]; + const uint8_t *control_stream[4][256]; + size_t control_stream_size[4][256]; } UtvideoContext; typedef struct HuffEntry { |