Mercurial > libavcodec.hg
annotate libschroedinger.h @ 10061:09f2db2d7c90 libavcodec
Fix bug caused by difference in stride and picture width.
When a frame is allocated using libschroedinger routines, the frame data size
does not match the actual frame size if the width is not a multiple of 16. So
we cannot do a straightforward memcpy of the frame returned by libschroedinger
into the FFmpeg picture as the stride differs from the width.
Fix this bug by allocating for the libschroedinger frame with the dimensions
in AVCodecContext within libavcodec and passing the frame to libschroedinger.
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk
author | diego |
---|---|
date | Sat, 15 Aug 2009 11:59:53 +0000 |
parents | 965220ebc611 |
children | 7dd2a45249a9 |
rev | line source |
---|---|
6738 | 1 /* |
2 * Copyright (c) 2008 BBC, Anuradha Suraparaju <asuraparaju at gmail dot com > | |
3 * | |
4 * This file is part of FFmpeg. | |
5 * | |
6 * FFmpeg is free software; you can redistribute it and/or | |
7 * modify it under the terms of the GNU Lesser General Public | |
8 * License as published by the Free Software Foundation; either | |
9 * version 2.1 of the License, or (at your option) any later version. | |
10 * | |
11 * FFmpeg is distributed in the hope that it will be useful, | |
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
14 * Lesser General Public License for more details. | |
15 * | |
16 * You should have received a copy of the GNU Lesser General Public | |
17 * License along with FFmpeg; if not, write to the Free Software | |
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
19 */ | |
20 | |
21 /** | |
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8590
diff
changeset
|
22 * @file libavcodec/libschroedinger.h |
6738 | 23 * data structures common to libschroedingerdec.c and libschroedingerenc.c |
24 */ | |
25 | |
7760 | 26 #ifndef AVCODEC_LIBSCHROEDINGER_H |
27 #define AVCODEC_LIBSCHROEDINGER_H | |
6738 | 28 |
29 #include <schroedinger/schrobitstream.h> | |
30 #include <schroedinger/schroframe.h> | |
31 #include "avcodec.h" | |
32 | |
33 static const struct { | |
34 enum PixelFormat ff_pix_fmt; | |
35 SchroChromaFormat schro_pix_fmt; | |
36 SchroFrameFormat schro_frame_fmt; | |
37 } ffmpeg_schro_pixel_format_map[] = { | |
38 { PIX_FMT_YUV420P, SCHRO_CHROMA_420, SCHRO_FRAME_FORMAT_U8_420 }, | |
39 { PIX_FMT_YUV422P, SCHRO_CHROMA_422, SCHRO_FRAME_FORMAT_U8_422 }, | |
40 { PIX_FMT_YUV444P, SCHRO_CHROMA_444, SCHRO_FRAME_FORMAT_U8_444 }, | |
41 }; | |
42 | |
43 /** | |
44 * Returns the video format preset matching the input video dimensions and | |
45 * time base. | |
46 */ | |
47 SchroVideoFormatEnum ff_get_schro_video_format_preset (AVCodecContext *avccontext); | |
48 | |
49 /** | |
50 * Sets the Schroedinger frame format corresponding to the Schro chroma format | |
51 * passed. Returns 0 on success, -1 on failure. | |
52 */ | |
10060
965220ebc611
cosmetics: indentation, prettyprinting, K&R coding style
diego
parents:
10041
diff
changeset
|
53 int ff_get_schro_frame_format(SchroChromaFormat schro_chroma_fmt, |
965220ebc611
cosmetics: indentation, prettyprinting, K&R coding style
diego
parents:
10041
diff
changeset
|
54 SchroFrameFormat *schro_frame_fmt); |
6738 | 55 |
10061
09f2db2d7c90
Fix bug caused by difference in stride and picture width.
diego
parents:
10060
diff
changeset
|
56 /** |
09f2db2d7c90
Fix bug caused by difference in stride and picture width.
diego
parents:
10060
diff
changeset
|
57 * Create a Schro frame based on the dimensions and frame format |
09f2db2d7c90
Fix bug caused by difference in stride and picture width.
diego
parents:
10060
diff
changeset
|
58 * passed. Returns a pointer to a frame on success, NULL on failure. |
09f2db2d7c90
Fix bug caused by difference in stride and picture width.
diego
parents:
10060
diff
changeset
|
59 */ |
09f2db2d7c90
Fix bug caused by difference in stride and picture width.
diego
parents:
10060
diff
changeset
|
60 SchroFrame *ff_create_schro_frame(AVCodecContext *avccontext, |
09f2db2d7c90
Fix bug caused by difference in stride and picture width.
diego
parents:
10060
diff
changeset
|
61 SchroFrameFormat schro_frame_fmt); |
09f2db2d7c90
Fix bug caused by difference in stride and picture width.
diego
parents:
10060
diff
changeset
|
62 |
7760 | 63 #endif /* AVCODEC_LIBSCHROEDINGER_H */ |