[FFmpeg-devel] [PATCH 1/7] hevc: pass the full HEVCNAL struct to decode_nal_unit

[Hendrik Leppkes]

This enables decode_nal_unit to access additional fields added in
subsequent commits.
---
 libavcodec/hevc.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 2bd89ec..8f60b3d 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2580,13 +2580,13 @@ fail:
 return ret;
 }
 
-static int decode_nal_unit(HEVCContext *s, const uint8_t *nal, int length)
+static int decode_nal_unit(HEVCContext *s, const HEVCNAL *nal)
 {
 HEVCLocalContext *lc = s-HEVClc;
 GetBitContext *gb= lc-gb;
 int ctb_addr_ts, ret;
 
-ret = init_get_bits8(gb, nal, length);
+ret = init_get_bits8(gb, nal-data, nal-size);
 if (ret  0)
 return ret;
 
@@ -2685,7 +2685,7 @@ static int decode_nal_unit(HEVCContext *s, const uint8_t 
*nal, int length)
 }
 
 if (s-threads_number  1  s-sh.num_entry_point_offsets  0)
-ctb_addr_ts = hls_slice_data_wpp(s, nal, length);
+ctb_addr_ts = hls_slice_data_wpp(s, nal-data, nal-size);
 else
 ctb_addr_ts = hls_slice_data(s);
 if (ctb_addr_ts = (s-sps-ctb_width * s-sps-ctb_height)) {
@@ -2937,7 +2937,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t 
*buf, int length)
 s-skipped_bytes = s-skipped_bytes_nal[i];
 s-skipped_bytes_pos = s-skipped_bytes_pos_nal[i];
 
-ret = decode_nal_unit(s, s-nals[i].data, s-nals[i].size);
+ret = decode_nal_unit(s, s-nals[i]);
 if (ret  0) {
 av_log(s-avctx, AV_LOG_WARNING,
Error parsing NAL unit #%d.\n, i);
-- 
1.9.5.msysgit.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 1/7] hevc: pass the full HEVCNAL struct to decode_nal_unit

[Hendrik Leppkes]

I forgot that this one was already applied, but it also didn't change in
the new set, so no harm in re-sending it. Now it all lines up perfectly!

The other patches got a few cosmetic changes, and one added error check in
the add hwaccel hooks patch.

- Hendrik
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 1/7] hevc: pass the full HEVCNAL struct to decode_nal_unit

[Hendrik Leppkes]

This enables decode_nal_unit to access additional fields added in
subsequent commits.
---
 libavcodec/hevc.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 2bd89ec..8f60b3d 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2580,13 +2580,13 @@ fail:
 return ret;
 }
 
-static int decode_nal_unit(HEVCContext *s, const uint8_t *nal, int length)
+static int decode_nal_unit(HEVCContext *s, const HEVCNAL *nal)
 {
 HEVCLocalContext *lc = s-HEVClc;
 GetBitContext *gb= lc-gb;
 int ctb_addr_ts, ret;
 
-ret = init_get_bits8(gb, nal, length);
+ret = init_get_bits8(gb, nal-data, nal-size);
 if (ret  0)
 return ret;
 
@@ -2685,7 +2685,7 @@ static int decode_nal_unit(HEVCContext *s, const uint8_t 
*nal, int length)
 }
 
 if (s-threads_number  1  s-sh.num_entry_point_offsets  0)
-ctb_addr_ts = hls_slice_data_wpp(s, nal, length);
+ctb_addr_ts = hls_slice_data_wpp(s, nal-data, nal-size);
 else
 ctb_addr_ts = hls_slice_data(s);
 if (ctb_addr_ts = (s-sps-ctb_width * s-sps-ctb_height)) {
@@ -2937,7 +2937,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t 
*buf, int length)
 s-skipped_bytes = s-skipped_bytes_nal[i];
 s-skipped_bytes_pos = s-skipped_bytes_pos_nal[i];
 
-ret = decode_nal_unit(s, s-nals[i].data, s-nals[i].size);
+ret = decode_nal_unit(s, s-nals[i]);
 if (ret  0) {
 av_log(s-avctx, AV_LOG_WARNING,
Error parsing NAL unit #%d.\n, i);
-- 
1.9.5.msysgit.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel