History

demux_mkv: don't warn if yaw/pitch projection is set to 0

This case will work fine, even if those are explicitly set.

Kacper Michajłow committed 2 years ago

Commit 367d02e1 parent 7bffdf31 file · +20 −2Browse files

Unified · Split

demux/demux_mkv.c+20−2
@@ -113,6 +113,8 @@ typedef struct mkv_track { · 112 unmodified lines
113113 struct pl_color_repr repr;
114114 struct pl_color_space color;
115115 uint32_t v_crop_top, v_crop_left, v_crop_right, v_crop_bottom;
116+ float v_projection_pose_yaw;
117+ float v_projection_pose_pitch;
116118 float v_projection_pose_roll;
117119
118120 uint32_t a_channels, a_bps;
@@ -657,14 +659,30 @@ static void parse_trackcolour(struct demuxer *demuxer, struct mkv_track *track, · 538 unmodified lines
657659 static void parse_trackprojection(struct demuxer *demuxer, struct mkv_track *track,
658660 struct ebml_projection *projection)
659661 {
660− if (projection->n_projection_pose_yaw || projection->n_projection_pose_pitch)
661− MP_WARN(demuxer, "Projection pose yaw/pitch not supported!\n");
662+ if (projection->n_projection_pose_yaw) {
663+ track->v_projection_pose_yaw = projection->projection_pose_yaw;
664+ MP_DBG(demuxer, "| + Projection pose yaw: %f\n",
665+ track->v_projection_pose_yaw);
666+ }
667+
668+ if (projection->n_projection_pose_pitch) {
669+ track->v_projection_pose_pitch = projection->projection_pose_pitch;
670+ MP_DBG(demuxer, "| + Projection pose pitch: %f\n",
671+ track->v_projection_pose_pitch);
672+ }
662673
663674 if (projection->n_projection_pose_roll) {
664675 track->v_projection_pose_roll = projection->projection_pose_roll;
665676 MP_DBG(demuxer, "| + Projection pose roll: %f\n",
666677 track->v_projection_pose_roll);
667678 }
679+
680+ if (track->v_projection_pose_yaw || track->v_projection_pose_pitch) {
681+ MP_WARN(demuxer, "Not supported projection: yaw %f, pitch %f, roll %f\n",
682+ track->v_projection_pose_yaw,
683+ track->v_projection_pose_pitch,
684+ track->v_projection_pose_roll);
685+ }
668686 }
669687
670688 static void parse_trackvideo(struct demuxer *demuxer, struct mkv_track *track,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t