projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0165a71
)
Use AV_ prefixes on some FFmpeg bits.
author
Carl Hetherington
<cth@carlh.net>
Thu, 15 Oct 2015 08:14:43 +0000
(09:14 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 15 Oct 2015 08:14:43 +0000
(09:14 +0100)
13 files changed:
src/lib/ffmpeg_decoder.cc
patch
|
blob
|
history
src/lib/filter_graph.cc
patch
|
blob
|
history
src/lib/image.cc
patch
|
blob
|
history
src/lib/j2k_image_proxy.cc
patch
|
blob
|
history
src/lib/magick_image_proxy.cc
patch
|
blob
|
history
src/lib/player_video.cc
patch
|
blob
|
history
src/lib/render_subtitles.cc
patch
|
blob
|
history
src/lib/video_decoder.cc
patch
|
blob
|
history
src/wx/film_viewer.cc
patch
|
blob
|
history
src/wx/video_waveform_plot.cc
patch
|
blob
|
history
test/client_server_test.cc
patch
|
blob
|
history
test/image_test.cc
patch
|
blob
|
history
test/make_black_test.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_decoder.cc
b/src/lib/ffmpeg_decoder.cc
index 83bce18308ae3b42de919ad6ffc26fe356ee3d61..72a3d02b49f6f732827a649ab24d4e4815ce64bf 100644
(file)
--- a/
src/lib/ffmpeg_decoder.cc
+++ b/
src/lib/ffmpeg_decoder.cc
@@
-467,7
+467,7
@@
FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP
/* Note RGBA is expressed little-endian, so the first byte in the word is R, second
G, third B, fourth A.
*/
/* Note RGBA is expressed little-endian, so the first byte in the word is R, second
G, third B, fourth A.
*/
- shared_ptr<Image> image (new Image (PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true));
+ shared_ptr<Image> image (new Image (
AV_
PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true));
/* Start of the first line in the subtitle */
uint8_t* sub_p = rect->pict.data[0];
/* Start of the first line in the subtitle */
uint8_t* sub_p = rect->pict.data[0];
diff --git
a/src/lib/filter_graph.cc
b/src/lib/filter_graph.cc
index a8159350994f2a429740f8f4d16231e4512ff0b0..7af247f669f64f7fb022843f9af994a3a6d5887f 100644
(file)
--- a/
src/lib/filter_graph.cc
+++ b/
src/lib/filter_graph.cc
@@
-95,9
+95,9
@@
FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s,
}
AVBufferSinkParams* sink_params = av_buffersink_params_alloc ();
}
AVBufferSinkParams* sink_params = av_buffersink_params_alloc ();
-
PixelFormat* pixel_fmts = new
PixelFormat[2];
+
AVPixelFormat* pixel_fmts = new AV
PixelFormat[2];
pixel_fmts[0] = _pixel_format;
pixel_fmts[0] = _pixel_format;
- pixel_fmts[1] = PIX_FMT_NONE;
+ pixel_fmts[1] =
AV_
PIX_FMT_NONE;
sink_params->pixel_fmts = pixel_fmts;
if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, N_("out"), 0, sink_params, graph) < 0) {
sink_params->pixel_fmts = pixel_fmts;
if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, N_("out"), 0, sink_params, graph) < 0) {
diff --git
a/src/lib/image.cc
b/src/lib/image.cc
index a327c3f855356ace8dacede031fabae880618941..4e1894ed6d3f638dbf89ea2135b9bc07404b8459 100644
(file)
--- a/
src/lib/image.cc
+++ b/
src/lib/image.cc
@@
-102,7
+102,7
@@
Image::planes () const
throw PixelFormatError ("planes()", _pixel_format);
}
throw PixelFormatError ("planes()", _pixel_format);
}
- if ((d->flags &
PIX_FMT
_PLANAR) == 0) {
+ if ((d->flags &
AV_PIX_FMT_FLAG
_PLANAR) == 0) {
return 1;
}
return 1;
}
@@
-273,45
+273,45
@@
Image::make_black ()
static uint16_t const sixteen_bit_uv = (1 << 15) - 1;
switch (_pixel_format) {
static uint16_t const sixteen_bit_uv = (1 << 15) - 1;
switch (_pixel_format) {
- case PIX_FMT_YUV420P:
- case PIX_FMT_YUV422P:
- case PIX_FMT_YUV444P:
- case PIX_FMT_YUV411P:
+ case
AV_
PIX_FMT_YUV420P:
+ case
AV_
PIX_FMT_YUV422P:
+ case
AV_
PIX_FMT_YUV444P:
+ case
AV_
PIX_FMT_YUV411P:
memset (data()[0], 0, sample_size(0).height * stride()[0]);
memset (data()[1], eight_bit_uv, sample_size(1).height * stride()[1]);
memset (data()[2], eight_bit_uv, sample_size(2).height * stride()[2]);
break;
memset (data()[0], 0, sample_size(0).height * stride()[0]);
memset (data()[1], eight_bit_uv, sample_size(1).height * stride()[1]);
memset (data()[2], eight_bit_uv, sample_size(2).height * stride()[2]);
break;
- case PIX_FMT_YUVJ420P:
- case PIX_FMT_YUVJ422P:
- case PIX_FMT_YUVJ444P:
+ case
AV_
PIX_FMT_YUVJ420P:
+ case
AV_
PIX_FMT_YUVJ422P:
+ case
AV_
PIX_FMT_YUVJ444P:
memset (data()[0], 0, sample_size(0).height * stride()[0]);
memset (data()[1], eight_bit_uv + 1, sample_size(1).height * stride()[1]);
memset (data()[2], eight_bit_uv + 1, sample_size(2).height * stride()[2]);
break;
memset (data()[0], 0, sample_size(0).height * stride()[0]);
memset (data()[1], eight_bit_uv + 1, sample_size(1).height * stride()[1]);
memset (data()[2], eight_bit_uv + 1, sample_size(2).height * stride()[2]);
break;
- case PIX_FMT_YUV422P9LE:
- case PIX_FMT_YUV444P9LE:
+ case
AV_
PIX_FMT_YUV422P9LE:
+ case
AV_
PIX_FMT_YUV444P9LE:
yuv_16_black (nine_bit_uv, false);
break;
yuv_16_black (nine_bit_uv, false);
break;
- case PIX_FMT_YUV422P9BE:
- case PIX_FMT_YUV444P9BE:
+ case
AV_
PIX_FMT_YUV422P9BE:
+ case
AV_
PIX_FMT_YUV444P9BE:
yuv_16_black (swap_16 (nine_bit_uv), false);
break;
yuv_16_black (swap_16 (nine_bit_uv), false);
break;
- case PIX_FMT_YUV422P10LE:
- case PIX_FMT_YUV444P10LE:
+ case
AV_
PIX_FMT_YUV422P10LE:
+ case
AV_
PIX_FMT_YUV444P10LE:
yuv_16_black (ten_bit_uv, false);
break;
yuv_16_black (ten_bit_uv, false);
break;
- case PIX_FMT_YUV422P16LE:
- case PIX_FMT_YUV444P16LE:
+ case
AV_
PIX_FMT_YUV422P16LE:
+ case
AV_
PIX_FMT_YUV444P16LE:
yuv_16_black (sixteen_bit_uv, false);
break;
yuv_16_black (sixteen_bit_uv, false);
break;
- case PIX_FMT_YUV444P10BE:
- case PIX_FMT_YUV422P10BE:
+ case
AV_
PIX_FMT_YUV444P10BE:
+ case
AV_
PIX_FMT_YUV422P10BE:
yuv_16_black (swap_16 (ten_bit_uv), false);
break;
yuv_16_black (swap_16 (ten_bit_uv), false);
break;
@@
-351,18
+351,18
@@
Image::make_black ()
yuv_16_black (sixteen_bit_uv, true);
break;
yuv_16_black (sixteen_bit_uv, true);
break;
- case PIX_FMT_RGB24:
- case PIX_FMT_ARGB:
- case PIX_FMT_RGBA:
- case PIX_FMT_ABGR:
- case PIX_FMT_BGRA:
- case PIX_FMT_RGB555LE:
- case PIX_FMT_RGB48LE:
- case PIX_FMT_RGB48BE:
+ case
AV_
PIX_FMT_RGB24:
+ case
AV_
PIX_FMT_ARGB:
+ case
AV_
PIX_FMT_RGBA:
+ case
AV_
PIX_FMT_ABGR:
+ case
AV_
PIX_FMT_BGRA:
+ case
AV_
PIX_FMT_RGB555LE:
+ case
AV_
PIX_FMT_RGB48LE:
+ case
AV_
PIX_FMT_RGB48BE:
memset (data()[0], 0, sample_size(0).height * stride()[0]);
break;
memset (data()[0], 0, sample_size(0).height * stride()[0]);
break;
- case PIX_FMT_UYVY422:
+ case
AV_
PIX_FMT_UYVY422:
{
int const Y = sample_size(0).height;
int const X = line_size()[0];
{
int const Y = sample_size(0).height;
int const X = line_size()[0];
@@
-386,7
+386,7
@@
Image::make_black ()
void
Image::make_transparent ()
{
void
Image::make_transparent ()
{
- if (_pixel_format != PIX_FMT_RGBA) {
+ if (_pixel_format !=
AV_
PIX_FMT_RGBA) {
throw PixelFormatError ("make_transparent()", _pixel_format);
}
throw PixelFormatError ("make_transparent()", _pixel_format);
}
@@
-396,7
+396,7
@@
Image::make_transparent ()
void
Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
{
void
Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
{
- DCPOMATIC_ASSERT (other->pixel_format() == PIX_FMT_RGBA);
+ DCPOMATIC_ASSERT (other->pixel_format() ==
AV_
PIX_FMT_RGBA);
int const other_bpp = 4;
int start_tx = position.x;
int const other_bpp = 4;
int start_tx = position.x;
@@
-416,7
+416,7
@@
Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
}
switch (_pixel_format) {
}
switch (_pixel_format) {
- case PIX_FMT_RGB24:
+ case
AV_
PIX_FMT_RGB24:
{
int const this_bpp = 3;
for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
{
int const this_bpp = 3;
for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
@@
-434,8
+434,8
@@
Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
}
break;
}
}
break;
}
- case PIX_FMT_BGRA:
- case PIX_FMT_RGBA:
+ case
AV_
PIX_FMT_BGRA:
+ case
AV_
PIX_FMT_RGBA:
{
int const this_bpp = 4;
for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
{
int const this_bpp = 4;
for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
@@
-454,7
+454,7
@@
Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
}
break;
}
}
break;
}
- case PIX_FMT_RGB48LE:
+ case
AV_
PIX_FMT_RGB48LE:
{
int const this_bpp = 6;
for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
{
int const this_bpp = 6;
for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
@@
-482,7
+482,7
@@
void
Image::copy (shared_ptr<const Image> other, Position<int> position)
{
/* Only implemented for RGB24 onto RGB24 so far */
Image::copy (shared_ptr<const Image> other, Position<int> position)
{
/* Only implemented for RGB24 onto RGB24 so far */
- DCPOMATIC_ASSERT (_pixel_format ==
PIX_FMT_RGB24 && other->pixel_format() ==
PIX_FMT_RGB24);
+ DCPOMATIC_ASSERT (_pixel_format ==
AV_PIX_FMT_RGB24 && other->pixel_format() == AV_
PIX_FMT_RGB24);
DCPOMATIC_ASSERT (position.x >= 0 && position.y >= 0);
int const N = min (position.x + other->size().width, size().width) - position.x;
DCPOMATIC_ASSERT (position.x >= 0 && position.y >= 0);
int const N = min (position.x + other->size().width, size().width) - position.x;
@@
-544,7
+544,7
@@
Image::bytes_per_pixel (int c) const
bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
}
bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
}
- if ((d->flags &
PIX_FMT
_PLANAR) == 0) {
+ if ((d->flags &
AV_PIX_FMT_FLAG
_PLANAR) == 0) {
/* Not planar; sum them up */
return bpp[0] + bpp[1] + bpp[2] + bpp[3];
}
/* Not planar; sum them up */
return bpp[0] + bpp[1] + bpp[2] + bpp[3];
}
@@
-788,19
+788,19
@@
void
Image::fade (float f)
{
switch (_pixel_format) {
Image::fade (float f)
{
switch (_pixel_format) {
- case PIX_FMT_YUV420P:
- case PIX_FMT_YUV422P:
- case PIX_FMT_YUV444P:
- case PIX_FMT_YUV411P:
- case PIX_FMT_YUVJ420P:
- case PIX_FMT_YUVJ422P:
- case PIX_FMT_YUVJ444P:
- case PIX_FMT_RGB24:
- case PIX_FMT_ARGB:
- case PIX_FMT_RGBA:
- case PIX_FMT_ABGR:
- case PIX_FMT_BGRA:
- case PIX_FMT_RGB555LE:
+ case
AV_
PIX_FMT_YUV420P:
+ case
AV_
PIX_FMT_YUV422P:
+ case
AV_
PIX_FMT_YUV444P:
+ case
AV_
PIX_FMT_YUV411P:
+ case
AV_
PIX_FMT_YUVJ420P:
+ case
AV_
PIX_FMT_YUVJ422P:
+ case
AV_
PIX_FMT_YUVJ444P:
+ case
AV_
PIX_FMT_RGB24:
+ case
AV_
PIX_FMT_ARGB:
+ case
AV_
PIX_FMT_RGBA:
+ case
AV_
PIX_FMT_ABGR:
+ case
AV_
PIX_FMT_BGRA:
+ case
AV_
PIX_FMT_RGB555LE:
/* 8-bit */
for (int c = 0; c < 3; ++c) {
uint8_t* p = data()[c];
/* 8-bit */
for (int c = 0; c < 3; ++c) {
uint8_t* p = data()[c];
@@
-816,12
+816,12
@@
Image::fade (float f)
}
break;
}
break;
- case PIX_FMT_YUV422P9LE:
- case PIX_FMT_YUV444P9LE:
- case PIX_FMT_YUV422P10LE:
- case PIX_FMT_YUV444P10LE:
- case PIX_FMT_YUV422P16LE:
- case PIX_FMT_YUV444P16LE:
+ case
AV_
PIX_FMT_YUV422P9LE:
+ case
AV_
PIX_FMT_YUV444P9LE:
+ case
AV_
PIX_FMT_YUV422P10LE:
+ case
AV_
PIX_FMT_YUV444P10LE:
+ case
AV_
PIX_FMT_YUV422P16LE:
+ case
AV_
PIX_FMT_YUV444P16LE:
case AV_PIX_FMT_YUVA420P9LE:
case AV_PIX_FMT_YUVA422P9LE:
case AV_PIX_FMT_YUVA444P9LE:
case AV_PIX_FMT_YUVA420P9LE:
case AV_PIX_FMT_YUVA422P9LE:
case AV_PIX_FMT_YUVA444P9LE:
@@
-846,10
+846,10
@@
Image::fade (float f)
}
break;
}
break;
- case PIX_FMT_YUV422P9BE:
- case PIX_FMT_YUV444P9BE:
- case PIX_FMT_YUV444P10BE:
- case PIX_FMT_YUV422P10BE:
+ case
AV_
PIX_FMT_YUV422P9BE:
+ case
AV_
PIX_FMT_YUV444P9BE:
+ case
AV_
PIX_FMT_YUV444P10BE:
+ case
AV_
PIX_FMT_YUV422P10BE:
case AV_PIX_FMT_YUVA420P9BE:
case AV_PIX_FMT_YUVA422P9BE:
case AV_PIX_FMT_YUVA444P9BE:
case AV_PIX_FMT_YUVA420P9BE:
case AV_PIX_FMT_YUVA422P9BE:
case AV_PIX_FMT_YUVA444P9BE:
@@
-877,7
+877,7
@@
Image::fade (float f)
}
break;
}
break;
- case PIX_FMT_UYVY422:
+ case
AV_
PIX_FMT_UYVY422:
{
int const Y = sample_size(0).height;
int const X = line_size()[0];
{
int const Y = sample_size(0).height;
int const X = line_size()[0];
diff --git
a/src/lib/j2k_image_proxy.cc
b/src/lib/j2k_image_proxy.cc
index 303792b80f406e8e8417e401ed646f3410d10f81..b6e684815b3e8cfcd346de91b60ad6b08ab28afd 100644
(file)
--- a/
src/lib/j2k_image_proxy.cc
+++ b/
src/lib/j2k_image_proxy.cc
@@
-83,7
+83,7
@@
J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
shared_ptr<Image>
J2KImageProxy::image (optional<dcp::NoteHandler> note) const
{
shared_ptr<Image>
J2KImageProxy::image (optional<dcp::NoteHandler> note) const
{
- shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, true));
+ shared_ptr<Image> image (new Image (
AV_
PIX_FMT_RGB48LE, _size, true));
shared_ptr<dcp::OpenJPEGImage> oj = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
shared_ptr<dcp::OpenJPEGImage> oj = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
diff --git
a/src/lib/magick_image_proxy.cc
b/src/lib/magick_image_proxy.cc
index 5a0ce94bf743ee5a205e1e2a350e4f5d8ae4c63b..ccc0878d9f490d360f3b95d44fbe6932d29ba85e 100644
(file)
--- a/
src/lib/magick_image_proxy.cc
+++ b/
src/lib/magick_image_proxy.cc
@@
-103,7
+103,7
@@
MagickImageProxy::image (optional<dcp::NoteHandler>) const
dcp::Size size (magick_image->columns(), magick_image->rows());
dcp::Size size (magick_image->columns(), magick_image->rows());
- _image.reset (new Image (PIX_FMT_RGB24, size, true));
+ _image.reset (new Image (
AV_
PIX_FMT_RGB24, size, true));
/* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
uint8_t* p = _image->data()[0];
/* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
uint8_t* p = _image->data()[0];
diff --git
a/src/lib/player_video.cc
b/src/lib/player_video.cc
index 3e361e45de48dc001f5e2e860a694e3b642a5758..c654abddeee91816294edd541cdabaf4d4d30cfa 100644
(file)
--- a/
src/lib/player_video.cc
+++ b/
src/lib/player_video.cc
@@
-75,7
+75,7
@@
PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
if (node->optional_number_child<int> ("SubtitleX")) {
shared_ptr<Image> image (
if (node->optional_number_child<int> ("SubtitleX")) {
shared_ptr<Image> image (
- new Image (PIX_FMT_RGBA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
+ new Image (
AV_
PIX_FMT_RGBA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
);
image->read_from_socket (socket);
);
image->read_from_socket (socket);
diff --git
a/src/lib/render_subtitles.cc
b/src/lib/render_subtitles.cc
index e22c8c44fb19acac05131422d4302ccafb0d2488..f507238fb59033fd078be4399e409b2f5d4676c6 100644
(file)
--- a/
src/lib/render_subtitles.cc
+++ b/
src/lib/render_subtitles.cc
@@
-70,7
+70,7
@@
render_subtitle (dcp::SubtitleString const & subtitle, list<shared_ptr<Font> > f
/* ...and add a bit more for luck */
height += target.height / 11;
/* ...and add a bit more for luck */
height += target.height / 11;
- shared_ptr<Image> image (new Image (PIX_FMT_RGBA, dcp::Size (target.width, height), false));
+ shared_ptr<Image> image (new Image (
AV_
PIX_FMT_RGBA, dcp::Size (target.width, height), false));
image->make_black ();
Cairo::RefPtr<Cairo::ImageSurface> surface = Cairo::ImageSurface::create (
image->make_black ();
Cairo::RefPtr<Cairo::ImageSurface> surface = Cairo::ImageSurface::create (
diff --git
a/src/lib/video_decoder.cc
b/src/lib/video_decoder.cc
index 88f88c1296a16c35c833c36172cc438fdaa61804..02f8fa0ac661a6eb946dd9ff498a09fdeb606813 100644
(file)
--- a/
src/lib/video_decoder.cc
+++ b/
src/lib/video_decoder.cc
@@
-44,7
+44,7
@@
VideoDecoder::VideoDecoder (shared_ptr<const VideoContent> c)
, _last_seek_accurate (true)
, _ignore_video (false)
{
, _last_seek_accurate (true)
, _ignore_video (false)
{
- _black_image.reset (new Image (PIX_FMT_RGB24, _video_content->video_size(), true));
+ _black_image.reset (new Image (
AV_
PIX_FMT_RGB24, _video_content->video_size(), true));
_black_image->make_black ();
}
_black_image->make_black ();
}
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index 27c8d23b61710d4478c3a96008c52176bceeec66..5cbe884ec8bd43f42daf28da1724a6df0eb185a9 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-186,7
+186,7
@@
FilmViewer::get (DCPTime p, bool accurate)
if (!pvf.empty ()) {
try {
if (!pvf.empty ()) {
try {
- _frame = pvf.front()->image (PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
+ _frame = pvf.front()->image (
AV_
PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
ImageChanged (pvf.front ());
dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
ImageChanged (pvf.front ());
dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
@@
-194,7
+194,7
@@
FilmViewer::get (DCPTime p, bool accurate)
yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb();
}
yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb();
}
- _frame = _frame->scale (_frame->size(), yuv_to_rgb, PIX_FMT_RGB24, false);
+ _frame = _frame->scale (_frame->size(), yuv_to_rgb,
AV_
PIX_FMT_RGB24, false);
_position = pvf.front()->time ();
_inter_position = pvf.front()->inter_position ();
_inter_size = pvf.front()->inter_size ();
_position = pvf.front()->time ();
_inter_position = pvf.front()->inter_position ();
_inter_size = pvf.front()->inter_size ();
diff --git
a/src/wx/video_waveform_plot.cc
b/src/wx/video_waveform_plot.cc
index a9100b4b48bf2661f1e468ddf698fcd02fcb6895..0dedd9bb1f89555001c28dc6d2f0629770492511 100644
(file)
--- a/
src/wx/video_waveform_plot.cc
+++ b/
src/wx/video_waveform_plot.cc
@@
-137,7
+137,7
@@
VideoWaveformPlot::create_waveform ()
}
dcp::Size const size = _image->size();
}
dcp::Size const size = _image->size();
- _waveform.reset (new Image (PIX_FMT_RGB24, dcp::Size (size.width, size.height), true));
+ _waveform.reset (new Image (
AV_
PIX_FMT_RGB24, dcp::Size (size.width, size.height), true));
for (int x = 0; x < size.width; ++x) {
for (int x = 0; x < size.width; ++x) {
@@
-166,7
+166,7
@@
VideoWaveformPlot::create_waveform ()
_waveform = _waveform->scale (
dcp::Size (GetSize().GetWidth() - 32, GetSize().GetHeight() - _vertical_margin * 2),
_waveform = _waveform->scale (
dcp::Size (GetSize().GetWidth() - 32, GetSize().GetHeight() - _vertical_margin * 2),
- dcp::YUV_TO_RGB_REC709, PIX_FMT_RGB24, false
+ dcp::YUV_TO_RGB_REC709,
AV_
PIX_FMT_RGB24, false
);
}
);
}
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index dcd62ba968c215f38a39683694d5a4d7cdbf0eed..26554e46c2c941dd92562ef7ad197687e56cd665 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-55,7
+55,7
@@
do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, Dat
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
{
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
{
- shared_ptr<Image> image (new Image (PIX_FMT_RGB24, dcp::Size (1998, 1080), true));
+ shared_ptr<Image> image (new Image (
AV_
PIX_FMT_RGB24, dcp::Size (1998, 1080), true));
uint8_t* p = image->data()[0];
for (int y = 0; y < 1080; ++y) {
uint8_t* p = image->data()[0];
for (int y = 0; y < 1080; ++y) {
@@
-68,7
+68,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
p += image->stride()[0];
}
p += image->stride()[0];
}
- shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true));
+ shared_ptr<Image> sub_image (new Image (
AV_
PIX_FMT_RGBA, dcp::Size (100, 200), true));
p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
@@
-139,7
+139,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
{
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
{
- shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
+ shared_ptr<Image> image (new Image (
AV_
PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
for (int i = 0; i < image->planes(); ++i) {
uint8_t* p = image->data()[i];
for (int i = 0; i < image->planes(); ++i) {
uint8_t* p = image->data()[i];
@@
-148,7
+148,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
}
}
}
}
- shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true));
+ shared_ptr<Image> sub_image (new Image (
AV_
PIX_FMT_RGBA, dcp::Size (100, 200), true));
uint8_t* p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
uint8_t* p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
@@
-219,7
+219,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
{
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
{
- shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
+ shared_ptr<Image> image (new Image (
AV_
PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
for (int i = 0; i < image->planes(); ++i) {
uint8_t* p = image->data()[i];
for (int i = 0; i < image->planes(); ++i) {
uint8_t* p = image->data()[i];
diff --git
a/test/image_test.cc
b/test/image_test.cc
index b7f4f10fe179c094414d1fadde97c84ed390a5f9..55fbb990774b8c2009eb1852c5e7fb5157341639 100644
(file)
--- a/
test/image_test.cc
+++ b/
test/image_test.cc
@@
-35,7
+35,7
@@
using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (aligned_image_test)
{
BOOST_AUTO_TEST_CASE (aligned_image_test)
{
- Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), true);
+ Image* s = new Image (
AV_
PIX_FMT_RGB24, dcp::Size (50, 50), true);
BOOST_CHECK_EQUAL (s->planes(), 1);
/* 160 is 150 aligned to the nearest 32 bytes */
BOOST_CHECK_EQUAL (s->stride()[0], 160);
BOOST_CHECK_EQUAL (s->planes(), 1);
/* 160 is 150 aligned to the nearest 32 bytes */
BOOST_CHECK_EQUAL (s->stride()[0], 160);
@@
-62,7
+62,7
@@
BOOST_AUTO_TEST_CASE (aligned_image_test)
BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
/* assignment operator */
BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
/* assignment operator */
- Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), false);
+ Image* u = new Image (
AV_
PIX_FMT_YUV422P, dcp::Size (150, 150), false);
*u = *s;
BOOST_CHECK_EQUAL (u->planes(), 1);
BOOST_CHECK_EQUAL (u->stride()[0], 160);
*u = *s;
BOOST_CHECK_EQUAL (u->planes(), 1);
BOOST_CHECK_EQUAL (u->stride()[0], 160);
@@
-85,7
+85,7
@@
BOOST_AUTO_TEST_CASE (aligned_image_test)
BOOST_AUTO_TEST_CASE (compact_image_test)
{
BOOST_AUTO_TEST_CASE (compact_image_test)
{
- Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), false);
+ Image* s = new Image (
AV_
PIX_FMT_RGB24, dcp::Size (50, 50), false);
BOOST_CHECK_EQUAL (s->planes(), 1);
BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3);
BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3);
BOOST_CHECK_EQUAL (s->planes(), 1);
BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3);
BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3);
@@
-111,7
+111,7
@@
BOOST_AUTO_TEST_CASE (compact_image_test)
BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
/* assignment operator */
BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
/* assignment operator */
- Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), true);
+ Image* u = new Image (
AV_
PIX_FMT_YUV422P, dcp::Size (150, 150), true);
*u = *s;
BOOST_CHECK_EQUAL (u->planes(), 1);
BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3);
*u = *s;
BOOST_CHECK_EQUAL (u->planes(), 1);
BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3);
diff --git
a/test/make_black_test.cc
b/test/make_black_test.cc
index ec5aa6999950e7dae157ada78ce404a2c0e13dea..23f4a71ffd4fa342925ee425829402347174eb42 100644
(file)
--- a/
test/make_black_test.cc
+++ b/
test/make_black_test.cc
@@
-80,7
+80,7
@@
BOOST_AUTO_TEST_CASE (make_black_test)
for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
boost::shared_ptr<Image> foo (new Image (*i, in_size, true));
foo->make_black ();
for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
boost::shared_ptr<Image> foo (new Image (*i, in_size, true));
foo->make_black ();
- boost::shared_ptr<Image> bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true);
+ boost::shared_ptr<Image> bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601,
AV_
PIX_FMT_RGB24, true);
uint8_t* p = bar->data()[0];
for (int y = 0; y < bar->size().height; ++y) {
uint8_t* p = bar->data()[0];
for (int y = 0; y < bar->size().height; ++y) {