Extend the width/height doxy to clarify that it should store coded values.
Unified · Split
| @@ -13,6 +13,10 @@ libavutil: 2015-08-28 · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | API changes, most recent first: |
| 15 | 15 | |
| 16 | +2016-xx-xx - xxxxxxx - lavu 55.30.0 - frame.h | |
| 17 | + Add AVFrame.crop_left/right/top/bottom fields for attaching cropping | |
| 18 | + information to video frames. | |
| 19 | + | |
| 16 | 20 | 2016-xx-xx - xxxxxxx |
| 17 | 21 | Change av_sha_update() and av_md5_sum()/av_md5_update() length |
| 18 | 22 | parameter type to size_t at next major bump. |
| @@ -390,6 +390,10 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) · 389 unmodified lines | ||
| 390 | 390 | dst->key_frame = src->key_frame; |
| 391 | 391 | dst->pict_type = src->pict_type; |
| 392 | 392 | dst->sample_aspect_ratio = src->sample_aspect_ratio; |
| 393 | + dst->crop_top = src->crop_top; | |
| 394 | + dst->crop_bottom = src->crop_bottom; | |
| 395 | + dst->crop_left = src->crop_left; | |
| 396 | + dst->crop_right = src->crop_right; | |
| 393 | 397 | dst->pts = src->pts; |
| 394 | 398 | dst->repeat_pict = src->repeat_pict; |
| 395 | 399 | dst->interlaced_frame = src->interlaced_frame; |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #ifndef AVUTIL_FRAME_H |
| 26 | 26 | #define AVUTIL_FRAME_H |
| 27 | 27 | |
| 28 | +#include <stddef.h> | |
| 28 | 29 | #include <stdint.h> |
| 29 | 30 | |
| 30 | 31 | #include "avutil.h" |
| @@ -180,9 +181,18 @@ typedef struct AVFrame { · 149 unmodified lines | ||
| 180 | 181 | uint8_t **extended_data; |
| 181 | 182 | |
| 182 | 183 | /** |
| 183 | − * width and height of the video frame | |
| 184 | + * @name Video dimensions | |
| 185 | + * Video frames only. The coded dimensions (in pixels) of the video frame, | |
| 186 | + * i.e. the size of the rectangle that contains some well-defined values. | |
| 187 | + * | |
| 188 | + * @note The part of the frame intended for display/presentation is further | |
| 189 | + * restricted by the @ref cropping "Cropping rectangle". | |
| 190 | + * @{ | |
| 184 | 191 | */ |
| 185 | 192 | int width, height; |
| 193 | + /** | |
| 194 | + * @} | |
| 195 | + */ | |
| 186 | 196 | |
| 187 | 197 | /** |
| 188 | 198 | * number of audio samples (per channel) described by this frame |
| @@ -369,6 +379,22 @@ typedef struct AVFrame { · 180 unmodified lines | ||
| 369 | 379 | * AVHWFramesContext describing the frame. |
| 370 | 380 | */ |
| 371 | 381 | AVBufferRef *hw_frames_ctx; |
| 382 | + | |
| 383 | + /** | |
| 384 | + * @anchor cropping | |
| 385 | + * @name Cropping | |
| 386 | + * Video frames only. The number of pixels to discard from the the | |
| 387 | + * top/bottom/left/right border of the frame to obtain the sub-rectangle of | |
| 388 | + * the frame intended for presentation. | |
| 389 | + * @{ | |
| 390 | + */ | |
| 391 | + size_t crop_top; | |
| 392 | + size_t crop_bottom; | |
| 393 | + size_t crop_left; | |
| 394 | + size_t crop_right; | |
| 395 | + /** | |
| 396 | + * @} | |
| 397 | + */ | |
| 372 | 398 | } AVFrame; |
| 373 | 399 | |
| 374 | 400 | /** |
| @@ -54,7 +54,7 @@ · 53 unmodified lines | ||
| 54 | 54 | */ |
| 55 | 55 | |
| 56 | 56 | #define LIBAVUTIL_VERSION_MAJOR 55 |
| 57 | −#define LIBAVUTIL_VERSION_MINOR 29 | |
| 57 | +#define LIBAVUTIL_VERSION_MINOR 30 | |
| 58 | 58 | #define LIBAVUTIL_VERSION_MICRO 0 |
| 59 | 59 | |
| 60 | 60 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |