diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 21:42:28 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 21:48:54 +0300 |
commit | 470204218f37e361da02d75845f9db9793a4ee53 (patch) | |
tree | ba86e91f6b2c0a35192e4c04ab7182cadb5d3699 | |
parent | 4c46f1d493f4d68121526fbede459619a02afa5a (diff) | |
parent | f890677d05bc4e8b494a73373ab4cc19791bf884 (diff) |
Merge commit 'f890677d05bc4e8b494a73373ab4cc19791bf884'
* commit 'f890677d05bc4e8b494a73373ab4cc19791bf884':
Replace any remaining avpicture function with imgutils
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r-- | libavcodec/pnm_parser.c | 4 | ||||
-rw-r--r-- | libavcodec/pnmenc.c | 7 | ||||
-rw-r--r-- | libavcodec/targaenc.c | 4 | ||||
-rw-r--r-- | libavcodec/vble.c | 6 | ||||
-rw-r--r-- | libavdevice/libdc1394.c | 4 | ||||
-rw-r--r-- | libavdevice/v4l2.c | 4 | ||||
-rw-r--r-- | libavformat/rawvideodec.c | 3 | ||||
-rw-r--r-- | libavformat/yuv4mpegdec.c | 4 |
8 files changed, 24 insertions, 12 deletions
diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c index a5eb81f5f6..a7d70b9931 100644 --- a/libavcodec/pnm_parser.c +++ b/libavcodec/pnm_parser.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/imgutils.h" + #include "parser.h" //for ParseContext #include "pnm.h" @@ -66,7 +68,7 @@ retry: next = END_NOT_FOUND; } else { next = pnmctx.bytestream - pnmctx.bytestream_start - + avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); + + av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1); if (pnmctx.bytestream_start != buf) next -= pc->index; if (next > buf_size) diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index b3eb5d90d3..ba9478d0da 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" #include "avcodec.h" #include "internal.h" @@ -29,10 +30,10 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, uint8_t *bytestream, *bytestream_start, *bytestream_end; int i, h, h1, c, n, linesize, ret; uint8_t *ptr, *ptr1, *ptr2; + int size = av_image_get_buffer_size(avctx->pix_fmt, + avctx->width, avctx->height, 1); - if ((ret = ff_alloc_packet2(avctx, pkt, avpicture_get_size(avctx->pix_fmt, - avctx->width, - avctx->height) + 200, 0)) < 0) + if ((ret = ff_alloc_packet2(avctx, pkt, size + 200, 0)) < 0) return ret; bytestream_start = diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index de8163a5f0..ae93d48a5a 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -21,6 +21,7 @@ #include <string.h> +#include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" @@ -84,7 +85,8 @@ static int targa_encode_frame(AVCodecContext *avctx, AVPacket *pkt, av_log(avctx, AV_LOG_ERROR, "image dimensions too large\n"); return AVERROR(EINVAL); } - picsize = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); + picsize = av_image_get_buffer_size(avctx->pix_fmt, + avctx->width, avctx->height, 1); if ((ret = ff_alloc_packet2(avctx, pkt, picsize + 45, 0)) < 0) return ret; diff --git a/libavcodec/vble.c b/libavcodec/vble.c index 30b77cecf6..bb9c81c187 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -26,6 +26,8 @@ #define BITSTREAM_READER_LE +#include "libavutil/imgutils.h" + #include "avcodec.h" #include "get_bits.h" #include "huffyuvdsp.h" @@ -187,8 +189,8 @@ static av_cold int vble_decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->bits_per_raw_sample = 8; - ctx->size = avpicture_get_size(avctx->pix_fmt, - avctx->width, avctx->height); + ctx->size = av_image_get_buffer_size(avctx->pix_fmt, + avctx->width, avctx->height, 1); ctx->val = av_malloc_array(ctx->size, sizeof(*ctx->val)); diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index d5bbc7c780..dcdca6064f 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -41,6 +41,7 @@ #define DC1394_FRAMERATE_240 FRAMERATE_240 #endif +#include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/mathematics.h" @@ -180,7 +181,8 @@ static inline int dc1394_read_common(AVFormatContext *c, /* packet init */ av_init_packet(&dc1394->packet); - dc1394->packet.size = avpicture_get_size(fmt->pix_fmt, fmt->width, fmt->height); + dc1394->packet.size = av_image_get_buffer_size(fmt->pix_fmt, + fmt->width, fmt->height, 1); dc1394->packet.stream_index = vst->index; dc1394->packet.flags |= AV_PKT_FLAG_KEY; diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 9e8ba1e5b6..247b287689 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -939,8 +939,8 @@ static int v4l2_read_header(AVFormatContext *ctx) goto fail; st->codec->pix_fmt = ff_fmt_v4l2ff(desired_format, codec_id); - s->frame_size = - avpicture_get_size(st->codec->pix_fmt, s->width, s->height); + s->frame_size = av_image_get_buffer_size(st->codec->pix_fmt, + s->width, s->height, 1); if ((res = mmap_init(ctx)) || (res = mmap_start(ctx)) < 0) diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index cbcae43c72..7f355eff5b 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/imgutils.h" #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" @@ -73,7 +74,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt) width = st->codec->width; height = st->codec->height; - packet_size = avpicture_get_size(st->codec->pix_fmt, width, height); + packet_size = av_image_get_buffer_size(st->codec->pix_fmt, width, height, 1); if (packet_size < 0) return -1; diff --git a/libavformat/yuv4mpegdec.c b/libavformat/yuv4mpegdec.c index 0db42f5933..ea1ae25599 100644 --- a/libavformat/yuv4mpegdec.c +++ b/libavformat/yuv4mpegdec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/imgutils.h" + #include "avformat.h" #include "internal.h" #include "yuv4mpeg.h" @@ -256,7 +258,7 @@ static int yuv4_read_header(AVFormatContext *s) st->sample_aspect_ratio = (AVRational){ aspectn, aspectd }; st->codec->chroma_sample_location = chroma_sample_location; st->codec->field_order = field_order; - s->packet_size = avpicture_get_size(st->codec->pix_fmt, width, height) + Y4M_FRAME_MAGIC_LEN; + s->packet_size = av_image_get_buffer_size(st->codec->pix_fmt, width, height, 1) + Y4M_FRAME_MAGIC_LEN; if ((int) s->packet_size < 0) return s->packet_size; s->internal->data_offset = avio_tell(pb); |