X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fraw.c;h=aa1ea308b0bdefd7c0f7d4472259ab57e2a38faf;hb=a617c6aaa3e6c0201c9ea31d319808273efd78b0;hp=68502641d74e634efd0b05bd788f9c4fcf0c076c;hpb=ed395eb421903a4a963dcff814adbc68bbffd6b9;p=ffmpeg diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 68502641d74..aa1ea308b0b 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -2,20 +2,20 @@ * Raw Video Codec * Copyright (c) 2001 Fabrice Bellard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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, + * Libav 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 + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,7 +27,7 @@ #include "avcodec.h" #include "raw.h" -const PixelFormatTag ff_raw_pixelFormatTags[] = { +const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ { PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') }, { PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') }, @@ -43,9 +43,8 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { { PIX_FMT_YUVJ420P, MKTAG('Y', 'V', '1', '2') }, { PIX_FMT_YUVJ422P, MKTAG('Y', '4', '2', 'B') }, { PIX_FMT_YUVJ422P, MKTAG('P', '4', '2', '2') }, - { PIX_FMT_GRAY8, MKTAG('Y', '8', '0', '0') }, - { PIX_FMT_GRAY8, MKTAG(' ', ' ', 'Y', '8') }, - + { PIX_FMT_GRAY8, MKTAG('Y', '8', '0', '0') }, + { PIX_FMT_GRAY8, MKTAG(' ', ' ', 'Y', '8') }, { PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */ { PIX_FMT_YUYV422, MKTAG('Y', '4', '2', '2') }, @@ -62,6 +61,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { { PIX_FMT_UYVY422, MKTAG('A', 'V', '1', 'x') }, /* Avid 1:1x */ { PIX_FMT_UYVY422, MKTAG('A', 'V', 'u', 'p') }, { PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */ + { PIX_FMT_UYVY422, MKTAG('a', 'u', 'v', '2') }, { PIX_FMT_UYYVYY411, MKTAG('Y', '4', '1', '1') }, { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, { PIX_FMT_NV12, MKTAG('N', 'V', '1', '2') }, @@ -76,6 +76,10 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { { PIX_FMT_BGR555BE, MKTAG(15 , 'R', 'G', 'B') }, { PIX_FMT_RGB565BE, MKTAG(16 , 'B', 'G', 'R') }, { PIX_FMT_BGR565BE, MKTAG(16 , 'R', 'G', 'B') }, + { PIX_FMT_RGB444LE, MKTAG('R', 'G', 'B', 12) }, + { PIX_FMT_BGR444LE, MKTAG('B', 'G', 'R', 12) }, + { PIX_FMT_RGB444BE, MKTAG(12 , 'B', 'G', 'R') }, + { PIX_FMT_BGR444BE, MKTAG(12 , 'R', 'G', 'B') }, { PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') }, { PIX_FMT_BGRA, MKTAG('B', 'G', 'R', 'A') }, { PIX_FMT_ABGR, MKTAG('A', 'B', 'G', 'R') }, @@ -90,13 +94,27 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { { PIX_FMT_YUV444P, MKTAG('4', '4', '4', 'P') }, { PIX_FMT_YUVJ444P, MKTAG('4', '4', '4', 'P') }, { PIX_FMT_MONOWHITE,MKTAG('B', '1', 'W', '0') }, - { PIX_FMT_MONOBLACK,MKTAG('B', 'O', 'W', '1') }, + { PIX_FMT_MONOBLACK,MKTAG('B', '0', 'W', '1') }, { PIX_FMT_BGR8, MKTAG('B', 'G', 'R', 8 ) }, { PIX_FMT_RGB8, MKTAG('R', 'G', 'B', 8 ) }, { PIX_FMT_BGR4, MKTAG('B', 'G', 'R', 4 ) }, { PIX_FMT_RGB4, MKTAG('R', 'G', 'B', 4 ) }, + { PIX_FMT_RGB4_BYTE,MKTAG('B', '4', 'B', 'Y') }, + { PIX_FMT_BGR4_BYTE,MKTAG('R', '4', 'B', 'Y') }, { PIX_FMT_RGB48LE, MKTAG('R', 'G', 'B', 48 ) }, { PIX_FMT_RGB48BE, MKTAG( 48, 'R', 'G', 'B') }, + { PIX_FMT_BGR48LE, MKTAG('B', 'G', 'R', 48 ) }, + { PIX_FMT_BGR48BE, MKTAG( 48, 'B', 'G', 'R') }, + { PIX_FMT_GRAY16LE, MKTAG('Y', '1', 0 , 16 ) }, + { PIX_FMT_GRAY16BE, MKTAG(16 , 0 , '1', 'Y') }, + { PIX_FMT_YUV420P16LE, MKTAG('Y', '3', 11 , 16 ) }, + { PIX_FMT_YUV420P16BE, MKTAG(16 , 11 , '3', 'Y') }, + { PIX_FMT_YUV422P16LE, MKTAG('Y', '3', 10 , 16 ) }, + { PIX_FMT_YUV422P16BE, MKTAG(16 , 10 , '3', 'Y') }, + { PIX_FMT_YUV444P16LE, MKTAG('Y', '3', 0 , 16 ) }, + { PIX_FMT_YUV444P16BE, MKTAG(16 , 0 , '3', 'Y') }, + { PIX_FMT_YUVA420P, MKTAG('Y', '4', 11 , 8 ) }, + { PIX_FMT_Y400A, MKTAG('Y', '2', 0 , 8 ) }, /* quicktime */ { PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') }, @@ -104,7 +122,16 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { { PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */ { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') }, { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') }, - { PIX_FMT_PAL8, MKTAG('W', 'R', 'A', 'W') }, + { PIX_FMT_YUYV422, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */ + { PIX_FMT_RGB555LE,MKTAG('L', '5', '5', '5') }, + { PIX_FMT_RGB565LE,MKTAG('L', '5', '6', '5') }, + { PIX_FMT_RGB565BE,MKTAG('B', '5', '6', '5') }, + { PIX_FMT_BGR24, MKTAG('2', '4', 'B', 'G') }, + { PIX_FMT_BGRA, MKTAG('B', 'G', 'R', 'A') }, + { PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') }, + { PIX_FMT_ABGR, MKTAG('A', 'B', 'G', 'R') }, + { PIX_FMT_GRAY16BE,MKTAG('b', '1', '6', 'g') }, + { PIX_FMT_RGB48BE, MKTAG('b', '4', '8', 'r') }, /* special */ { PIX_FMT_RGB565LE,MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */ @@ -114,7 +141,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat fmt) { - const PixelFormatTag * tags = ff_raw_pixelFormatTags; + const PixelFormatTag *tags = ff_raw_pix_fmt_tags; while (tags->pix_fmt >= 0) { if (tags->pix_fmt == fmt) return tags->fourcc;