Merge pull request #766 from chenrui333/fix-x265-4.0

chore: update AviRecord to comply with updated x265 API
TASEmulators · Nov 24, 2024 · cd057bb · cd057bb
2 parents f980ec2 + a6fcb73
commit cd057bb
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/drivers/Qt/AviRecord.cpp b/src/drivers/Qt/AviRecord.cpp
@@ -461,7 +461,14 @@ static int encode_frame( unsigned char *inBuf, int width, int height )
 	pic->stride[1] = width/2;
 	pic->stride[2] = width/2;
 
+#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;
+	ret = x265_encoder_encode( hdl, &nal, &i_nal, pic, pics );
+#else
 	ret = x265_encoder_encode( hdl, &nal, &i_nal, pic, &pic_out );
+#endif
 
 	if ( ret <= 0 )
 	{
@@ -494,7 +501,14 @@ static int close(void)
 	/* Flush delayed frames */
 	while( hdl != NULL )
 	{
+#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;
+	    ret = x265_encoder_encode( hdl, &nal, &i_nal, pic, pics );
+#else
 	    ret = x265_encoder_encode( hdl, &nal, &i_nal, NULL, &pic_out );
+#endif
 
 	    if ( ret <= 0 )
 	    {