[vlc-commits] [Git][videolan/vlc][3.0.x] codec: x265: handle 4.0 encoding API change

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
c0438390 by François Cartegnie at 2024-10-15T07:56:12+00:00
codec: x265: handle 4.0 encoding API change

refs #28799

(cherry picked from commit 83e2c3955a563b60f74f05cea57e3ab5f447c8fb)

- - - - -


1 changed file:

- modules/codec/x265.c


Changes:

=====================================
modules/codec/x265.c
=====================================
@@ -74,6 +74,11 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict)
     x265_picture pic;
 
     x265_picture_init(&p_sys->param, &pic);
+#ifdef MAX_SCALABLE_LAYERS
+    /* Handle API changes for scalable layers output in x265 4.0 */
+    x265_picture *pics[MAX_SCALABLE_LAYERS] = {NULL};
+    pics[0] = &pic;
+#endif
 
     if (likely(p_pict)) {
         pic.pts = p_pict->date;
@@ -92,8 +97,13 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict)
 
     x265_nal *nal;
     uint32_t i_nal = 0;
+#ifdef MAX_SCALABLE_LAYERS
+    x265_encoder_encode(p_sys->h, &nal, &i_nal,
+                        likely(p_pict) ? &pic : NULL, pics);
+#else
     x265_encoder_encode(p_sys->h, &nal, &i_nal,
             likely(p_pict) ? &pic : NULL, &pic);
+#endif
 
     if (!i_nal)
         return NULL;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c0438390cc8f551dbaef0131fa5e054c82f9fc12

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c0438390cc8f551dbaef0131fa5e054c82f9fc12
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance