Unified · Split
| @@ -57,9 +57,9 @@ static const AVOption showinfo_options[] = { · 56 unmodified lines | |||
| 57 | 57 | ||
| 58 | AVFILTER_DEFINE_CLASS(showinfo); | 58 | AVFILTER_DEFINE_CLASS(showinfo); |
| 59 | 59 | ||
| 60 | static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, AVFrameSideData *sd) | 60 | static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, const AVFrameSideData *sd) |
| 61 | { | 61 | { |
| 62 | AVSphericalMapping *spherical = (AVSphericalMapping *)sd->data; | 62 | const AVSphericalMapping *spherical = (const AVSphericalMapping *)sd->data; |
| 63 | double yaw, pitch, roll; | 63 | double yaw, pitch, roll; |
| 64 | 64 | ||
| 65 | av_log(ctx, AV_LOG_INFO, "spherical information: "); | 65 | av_log(ctx, AV_LOG_INFO, "spherical information: "); |
| @@ -96,9 +96,9 @@ static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, AVFrameSideData · 30 unmodified lines | |||
| 96 | } | 96 | } |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd) | 99 | static void dump_stereo3d(AVFilterContext *ctx, const AVFrameSideData *sd) |
| 100 | { | 100 | { |
| 101 | AVStereo3D *stereo; | 101 | const AVStereo3D *stereo; |
| 102 | 102 | ||
| 103 | av_log(ctx, AV_LOG_INFO, "stereoscopic information: "); | 103 | av_log(ctx, AV_LOG_INFO, "stereoscopic information: "); |
| 104 | if (sd->size < sizeof(*stereo)) { | 104 | if (sd->size < sizeof(*stereo)) { |
| @@ -106,7 +106,7 @@ static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd) · 1 unmodified line | |||
| 106 | return; | 106 | return; |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | stereo = (AVStereo3D *)sd->data; | 109 | stereo = (const AVStereo3D *)sd->data; |
| 110 | 110 | ||
| 111 | av_log(ctx, AV_LOG_INFO, "type - %s", av_stereo3d_type_name(stereo->type)); | 111 | av_log(ctx, AV_LOG_INFO, "type - %s", av_stereo3d_type_name(stereo->type)); |
| 112 | 112 | ||
| @@ -114,7 +114,7 @@ static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd) · 1 unmodified line | |||
| 114 | av_log(ctx, AV_LOG_INFO, " (inverted)"); | 114 | av_log(ctx, AV_LOG_INFO, " (inverted)"); |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | static void dump_s12m_timecode(AVFilterContext *ctx, AVRational frame_rate, AVFrameSideData *sd) | 117 | static void dump_s12m_timecode(AVFilterContext *ctx, AVRational frame_rate, const AVFrameSideData *sd) |
| 118 | { | 118 | { |
| 119 | const uint32_t *tc = (const uint32_t *)sd->data; | 119 | const uint32_t *tc = (const uint32_t *)sd->data; |
| 120 | 120 | ||
| @@ -130,7 +130,7 @@ static void dump_s12m_timecode(AVFilterContext *ctx, AVRational frame_rate, AVFr · 9 unmodified lines | |||
| 130 | } | 130 | } |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | static void dump_roi(AVFilterContext *ctx, AVFrameSideData *sd) | 133 | static void dump_roi(AVFilterContext *ctx, const AVFrameSideData *sd) |
| 134 | { | 134 | { |
| 135 | int nb_rois; | 135 | int nb_rois; |
| 136 | const AVRegionOfInterest *roi; | 136 | const AVRegionOfInterest *roi; |
| @@ -152,9 +152,9 @@ static void dump_roi(AVFilterContext *ctx, AVFrameSideData *sd) · 15 unmodified lines | |||
| 152 | } | 152 | } |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | static void dump_mastering_display(AVFilterContext *ctx, AVFrameSideData *sd) | 155 | static void dump_mastering_display(AVFilterContext *ctx, const AVFrameSideData *sd) |
| 156 | { | 156 | { |
| 157 | AVMasteringDisplayMetadata *mastering_display; | 157 | const AVMasteringDisplayMetadata *mastering_display; |
| 158 | 158 | ||
| 159 | av_log(ctx, AV_LOG_INFO, "mastering display: "); | 159 | av_log(ctx, AV_LOG_INFO, "mastering display: "); |
| 160 | if (sd->size < sizeof(*mastering_display)) { | 160 | if (sd->size < sizeof(*mastering_display)) { |
| @@ -162,7 +162,7 @@ static void dump_mastering_display(AVFilterContext *ctx, AVFrameSideData *sd) · 1 unmodified line | |||
| 162 | return; | 162 | return; |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | mastering_display = (AVMasteringDisplayMetadata *)sd->data; | 165 | mastering_display = (const AVMasteringDisplayMetadata *)sd->data; |
| 166 | 166 | ||
| 167 | av_log(ctx, AV_LOG_INFO, "has_primaries:%d has_luminance:%d " | 167 | av_log(ctx, AV_LOG_INFO, "has_primaries:%d has_luminance:%d " |
| 168 | "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f) " | 168 | "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f) " |
| @@ -178,18 +178,18 @@ static void dump_mastering_display(AVFilterContext *ctx, AVFrameSideData *sd) · 9 unmodified lines | |||
| 178 | av_q2d(mastering_display->min_luminance), av_q2d(mastering_display->max_luminance)); | 178 | av_q2d(mastering_display->min_luminance), av_q2d(mastering_display->max_luminance)); |
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | static void dump_content_light_metadata(AVFilterContext *ctx, AVFrameSideData *sd) | 181 | static void dump_content_light_metadata(AVFilterContext *ctx, const AVFrameSideData *sd) |
| 182 | { | 182 | { |
| 183 | AVContentLightMetadata* metadata = (AVContentLightMetadata*)sd->data; | 183 | const AVContentLightMetadata *metadata = (const AVContentLightMetadata *)sd->data; |
| 184 | 184 | ||
| 185 | av_log(ctx, AV_LOG_INFO, "Content Light Level information: " | 185 | av_log(ctx, AV_LOG_INFO, "Content Light Level information: " |
| 186 | "MaxCLL=%d, MaxFALL=%d", | 186 | "MaxCLL=%d, MaxFALL=%d", |
| 187 | metadata->MaxCLL, metadata->MaxFALL); | 187 | metadata->MaxCLL, metadata->MaxFALL); |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | static void dump_video_enc_params(AVFilterContext *ctx, AVFrameSideData *sd) | 190 | static void dump_video_enc_params(AVFilterContext *ctx, const AVFrameSideData *sd) |
| 191 | { | 191 | { |
| 192 | AVVideoEncParams *par = (AVVideoEncParams*)sd->data; | 192 | const AVVideoEncParams *par = (const AVVideoEncParams *)sd->data; |
| 193 | int plane, acdc; | 193 | int plane, acdc; |
| 194 | 194 | ||
| 195 | av_log(ctx, AV_LOG_INFO, "video encoding parameters: type %d; ", par->type); | 195 | av_log(ctx, AV_LOG_INFO, "video encoding parameters: type %d; ", par->type); |
| @@ -206,10 +206,10 @@ static void dump_video_enc_params(AVFilterContext *ctx, AVFrameSideData *sd) · 10 unmodified lines | |||
| 206 | av_log(ctx, AV_LOG_INFO, "%u blocks; ", par->nb_blocks); | 206 | av_log(ctx, AV_LOG_INFO, "%u blocks; ", par->nb_blocks); |
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | static void dump_sei_unregistered_metadata(AVFilterContext *ctx, AVFrameSideData *sd) | 209 | static void dump_sei_unregistered_metadata(AVFilterContext *ctx, const AVFrameSideData *sd) |
| 210 | { | 210 | { |
| 211 | const int uuid_size = 16; | 211 | const int uuid_size = 16; |
| 212 | uint8_t *user_data = sd->data; | 212 | const uint8_t *user_data = sd->data; |
| 213 | int i; | 213 | int i; |
| 214 | 214 | ||
| 215 | if (sd->size < uuid_size) { | 215 | if (sd->size < uuid_size) { |