Re: [FFmpeg-devel] [PATCH 1/2] avcodec/mips: build fix for MSA
On Thu, Oct 08, 2015 at 02:03:22PM +0530, shivraj.pa...@imgtec.com wrote: > From: Shivraj Patil > > Modified sps and pps access from old HEVCContext(s) structure to newly > introduced HEVCParamSets(ps). > > Signed-off-by: Shivraj Patil > --- > libavcodec/mips/hevcpred_msa.c | 282 > > 1 file changed, 141 insertions(+), 141 deletions(-) applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB When the tyrant has disposed of foreign enemies by conquest or treaty, and there is nothing more to fear from them, then he is always stirring up some war or other, in order that the people may require a leader. -- Plato signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/2] avcodec/mips: build fix for MSA
-Original Message- From: Michael Niedermayer [mailto:mich...@niedermayer.cc] Sent: 08 October 2015 00:16 To: FFmpeg development discussions and patches Cc: Shivraj Patil; Parag Salasakar; Manojkumar Bhosale Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/mips: build fix for MSA On Wed, Oct 07, 2015 at 06:20:53PM +0530, shivraj.pa...@imgtec.com wrote: > From: Shivraj Patil > > Modified sps and pps access from old HEVCContext(s) structure to newly > introduced HEVCParamSets(ps) > > Signed-off-by: Shivraj Patil > --- > libavcodec/mips/hevcpred_msa.c | 282 > > 1 file changed, 141 insertions(+), 141 deletions(-) does this or any other patch need to be backported to release/2.8 ? Shivraj:-Yes, both the patches needs to be backported to release/2.8. if so please backport them (assuming its not just a cherry pick without conflicts) Shivraj:- I am afraid with the backport steps. I have submitted both the patches prepared with release/2.8 clone. thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB No snowflake in an avalanche ever feels responsible. -- Voltaire ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 1/2] avcodec/mips: build fix for MSA
From: Shivraj Patil
Modified sps and pps access from old HEVCContext(s) structure to newly
introduced HEVCParamSets(ps).
Signed-off-by: Shivraj Patil
---
libavcodec/mips/hevcpred_msa.c | 282
1 file changed, 141 insertions(+), 141 deletions(-)
diff --git a/libavcodec/mips/hevcpred_msa.c b/libavcodec/mips/hevcpred_msa.c
index 5d9299f..6a3b281 100644
--- a/libavcodec/mips/hevcpred_msa.c
+++ b/libavcodec/mips/hevcpred_msa.c
@@ -1915,24 +1915,24 @@ void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0,
int y0, int c_idx)
v16u8 vec0;
HEVCLocalContext *lc = s->HEVClc;
int i;
-int hshift = s->sps->hshift[c_idx];
-int vshift = s->sps->vshift[c_idx];
+int hshift = s->ps.sps->hshift[c_idx];
+int vshift = s->ps.sps->vshift[c_idx];
int size_in_luma_h = 16 << hshift;
-int size_in_tbs_h = size_in_luma_h >> s->sps->log2_min_tb_size;
+int size_in_tbs_h = size_in_luma_h >> s->ps.sps->log2_min_tb_size;
int size_in_luma_v = 16 << vshift;
-int size_in_tbs_v = size_in_luma_v >> s->sps->log2_min_tb_size;
+int size_in_tbs_v = size_in_luma_v >> s->ps.sps->log2_min_tb_size;
int x = x0 >> hshift;
int y = y0 >> vshift;
-int x_tb = (x0 >> s->sps->log2_min_tb_size) & s->sps->tb_mask;
-int y_tb = (y0 >> s->sps->log2_min_tb_size) & s->sps->tb_mask;
+int x_tb = (x0 >> s->ps.sps->log2_min_tb_size) & s->ps.sps->tb_mask;
+int y_tb = (y0 >> s->ps.sps->log2_min_tb_size) & s->ps.sps->tb_mask;
int cur_tb_addr =
-s->pps->min_tb_addr_zs[(y_tb) * (s->sps->tb_mask + 2) + (x_tb)];
+s->ps.pps->min_tb_addr_zs[(y_tb) * (s->ps.sps->tb_mask + 2) + (x_tb)];
ptrdiff_t stride = s->frame->linesize[c_idx] / sizeof(uint8_t);
uint8_t *src = (uint8_t *) s->frame->data[c_idx] + x + y * stride;
-int min_pu_width = s->sps->min_pu_width;
+int min_pu_width = s->ps.sps->min_pu_width;
enum IntraPredMode mode = c_idx ? lc->tu.intra_pred_mode_c :
lc->tu.intra_pred_mode;
@@ -1948,41 +1948,41 @@ void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0,
int y0, int c_idx)
uint8_t *filtered_top = filtered_top_array + 1;
int cand_bottom_left = lc->na.cand_bottom_left
&& cur_tb_addr >
-s->pps->min_tb_addr_zs[((y_tb + size_in_tbs_v) & s->sps->tb_mask) *
- (s->sps->tb_mask + 2) + (x_tb - 1)];
+s->ps.pps->min_tb_addr_zs[((y_tb + size_in_tbs_v) &
s->ps.sps->tb_mask) *
+ (s->ps.sps->tb_mask + 2) + (x_tb - 1)];
int cand_left = lc->na.cand_left;
int cand_up_left = lc->na.cand_up_left;
int cand_up = lc->na.cand_up;
int cand_up_right = lc->na.cand_up_right
&& cur_tb_addr >
-s->pps->min_tb_addr_zs[(y_tb - 1) * (s->sps->tb_mask + 2) +
- ((x_tb + size_in_tbs_h) & s->sps->tb_mask)];
+s->ps.pps->min_tb_addr_zs[(y_tb - 1) * (s->ps.sps->tb_mask + 2) +
+ ((x_tb + size_in_tbs_h) & s->ps.sps->tb_mask)];
int bottom_left_size =
(((y0 + 2 * size_in_luma_v) >
- (s->sps->height) ? (s->sps->height) : (y0 +
+ (s->ps.sps->height) ? (s->ps.sps->height) : (y0 +
2 * size_in_luma_v)) -
(y0 + size_in_luma_v)) >> vshift;
int top_right_size =
(((x0 + 2 * size_in_luma_h) >
- (s->sps->width) ? (s->sps->width) : (x0 + 2 * size_in_luma_h)) -
+ (s->ps.sps->width) ? (s->ps.sps->width) : (x0 + 2 * size_in_luma_h))
-
(x0 + size_in_luma_h)) >> hshift;
-if (s->pps->constrained_intra_pred_flag == 1) {
-int size_in_luma_pu_v = ((size_in_luma_v) >> s->sps->log2_min_pu_size);
-int size_in_luma_pu_h = ((size_in_luma_h) >> s->sps->log2_min_pu_size);
-int on_pu_edge_x = !(x0 & ((1 << s->sps->log2_min_pu_size) - 1));
-int on_pu_edge_y = !(y0 & ((1 << s->sps->log2_min_pu_size) - 1));
+if (s->ps.pps->constrained_intra_pred_flag == 1) {
+int size_in_luma_pu_v = ((size_in_luma_v) >>
s->ps.sps->log2_min_pu_size);
+int size_in_luma_pu_h = ((size_in_luma_h) >>
s->ps.sps->log2_min_pu_size);
+int on_pu_edge_x = !(x0 & ((1 << s->ps.sps->log2_min_pu_size) - 1));
+int on_pu_edge_y = !(y0 & ((1 << s->ps.sps->log2_min_pu_size) - 1));
if (!size_in_luma_pu_h)
size_in_luma_pu_h++;
if (cand_bottom_left == 1 && on_pu_edge_x) {
-int x_left_pu = ((x0 - 1) >> s->sps->log2_min_pu_size);
+int x_left_pu = ((x0 - 1) >> s->ps.sps->log2_min_pu_size);
int y_bottom_pu =
-((y0 + size_in_luma_v) >> s->sps->log2_min_pu_size);
+((y0 + size_in_luma_v) >> s->ps.sps->log2_min_pu_size);
int max =
((size_in_luma_pu_v) >
- (s->sps->min_pu_height -
- y_bottom_pu) ? (s->sps->min_pu_height -
+ (s->ps
Re: [FFmpeg-devel] [PATCH 1/2] avcodec/mips: build fix for MSA
On Wed, Oct 07, 2015 at 06:20:53PM +0530, shivraj.pa...@imgtec.com wrote: > From: Shivraj Patil > > Modified sps and pps access from old HEVCContext(s) structure to newly > introduced HEVCParamSets(ps) > > Signed-off-by: Shivraj Patil > --- > libavcodec/mips/hevcpred_msa.c | 282 > > 1 file changed, 141 insertions(+), 141 deletions(-) does this or any other patch need to be backported to release/2.8 ? if so please backport them (assuming its not just a cherry pick without conflicts) thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB No snowflake in an avalanche ever feels responsible. -- Voltaire signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/2] avcodec/mips: build fix for MSA
On Wed, Oct 07, 2015 at 06:20:53PM +0530, shivraj.pa...@imgtec.com wrote: > From: Shivraj Patil > > Modified sps and pps access from old HEVCContext(s) structure to newly > introduced HEVCParamSets(ps) > > Signed-off-by: Shivraj Patil > --- > libavcodec/mips/hevcpred_msa.c | 282 > > 1 file changed, 141 insertions(+), 141 deletions(-) applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB What does censorship reveal? It reveals fear. -- Julian Assange signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 1/2] avcodec/mips: build fix for MSA
From: Shivraj Patil
Modified sps and pps access from old HEVCContext(s) structure to newly
introduced HEVCParamSets(ps)
Signed-off-by: Shivraj Patil
---
libavcodec/mips/hevcpred_msa.c | 282
1 file changed, 141 insertions(+), 141 deletions(-)
diff --git a/libavcodec/mips/hevcpred_msa.c b/libavcodec/mips/hevcpred_msa.c
index 5d9299f..6a3b281 100644
--- a/libavcodec/mips/hevcpred_msa.c
+++ b/libavcodec/mips/hevcpred_msa.c
@@ -1915,24 +1915,24 @@ void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0,
int y0, int c_idx)
v16u8 vec0;
HEVCLocalContext *lc = s->HEVClc;
int i;
-int hshift = s->sps->hshift[c_idx];
-int vshift = s->sps->vshift[c_idx];
+int hshift = s->ps.sps->hshift[c_idx];
+int vshift = s->ps.sps->vshift[c_idx];
int size_in_luma_h = 16 << hshift;
-int size_in_tbs_h = size_in_luma_h >> s->sps->log2_min_tb_size;
+int size_in_tbs_h = size_in_luma_h >> s->ps.sps->log2_min_tb_size;
int size_in_luma_v = 16 << vshift;
-int size_in_tbs_v = size_in_luma_v >> s->sps->log2_min_tb_size;
+int size_in_tbs_v = size_in_luma_v >> s->ps.sps->log2_min_tb_size;
int x = x0 >> hshift;
int y = y0 >> vshift;
-int x_tb = (x0 >> s->sps->log2_min_tb_size) & s->sps->tb_mask;
-int y_tb = (y0 >> s->sps->log2_min_tb_size) & s->sps->tb_mask;
+int x_tb = (x0 >> s->ps.sps->log2_min_tb_size) & s->ps.sps->tb_mask;
+int y_tb = (y0 >> s->ps.sps->log2_min_tb_size) & s->ps.sps->tb_mask;
int cur_tb_addr =
-s->pps->min_tb_addr_zs[(y_tb) * (s->sps->tb_mask + 2) + (x_tb)];
+s->ps.pps->min_tb_addr_zs[(y_tb) * (s->ps.sps->tb_mask + 2) + (x_tb)];
ptrdiff_t stride = s->frame->linesize[c_idx] / sizeof(uint8_t);
uint8_t *src = (uint8_t *) s->frame->data[c_idx] + x + y * stride;
-int min_pu_width = s->sps->min_pu_width;
+int min_pu_width = s->ps.sps->min_pu_width;
enum IntraPredMode mode = c_idx ? lc->tu.intra_pred_mode_c :
lc->tu.intra_pred_mode;
@@ -1948,41 +1948,41 @@ void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0,
int y0, int c_idx)
uint8_t *filtered_top = filtered_top_array + 1;
int cand_bottom_left = lc->na.cand_bottom_left
&& cur_tb_addr >
-s->pps->min_tb_addr_zs[((y_tb + size_in_tbs_v) & s->sps->tb_mask) *
- (s->sps->tb_mask + 2) + (x_tb - 1)];
+s->ps.pps->min_tb_addr_zs[((y_tb + size_in_tbs_v) &
s->ps.sps->tb_mask) *
+ (s->ps.sps->tb_mask + 2) + (x_tb - 1)];
int cand_left = lc->na.cand_left;
int cand_up_left = lc->na.cand_up_left;
int cand_up = lc->na.cand_up;
int cand_up_right = lc->na.cand_up_right
&& cur_tb_addr >
-s->pps->min_tb_addr_zs[(y_tb - 1) * (s->sps->tb_mask + 2) +
- ((x_tb + size_in_tbs_h) & s->sps->tb_mask)];
+s->ps.pps->min_tb_addr_zs[(y_tb - 1) * (s->ps.sps->tb_mask + 2) +
+ ((x_tb + size_in_tbs_h) & s->ps.sps->tb_mask)];
int bottom_left_size =
(((y0 + 2 * size_in_luma_v) >
- (s->sps->height) ? (s->sps->height) : (y0 +
+ (s->ps.sps->height) ? (s->ps.sps->height) : (y0 +
2 * size_in_luma_v)) -
(y0 + size_in_luma_v)) >> vshift;
int top_right_size =
(((x0 + 2 * size_in_luma_h) >
- (s->sps->width) ? (s->sps->width) : (x0 + 2 * size_in_luma_h)) -
+ (s->ps.sps->width) ? (s->ps.sps->width) : (x0 + 2 * size_in_luma_h))
-
(x0 + size_in_luma_h)) >> hshift;
-if (s->pps->constrained_intra_pred_flag == 1) {
-int size_in_luma_pu_v = ((size_in_luma_v) >> s->sps->log2_min_pu_size);
-int size_in_luma_pu_h = ((size_in_luma_h) >> s->sps->log2_min_pu_size);
-int on_pu_edge_x = !(x0 & ((1 << s->sps->log2_min_pu_size) - 1));
-int on_pu_edge_y = !(y0 & ((1 << s->sps->log2_min_pu_size) - 1));
+if (s->ps.pps->constrained_intra_pred_flag == 1) {
+int size_in_luma_pu_v = ((size_in_luma_v) >>
s->ps.sps->log2_min_pu_size);
+int size_in_luma_pu_h = ((size_in_luma_h) >>
s->ps.sps->log2_min_pu_size);
+int on_pu_edge_x = !(x0 & ((1 << s->ps.sps->log2_min_pu_size) - 1));
+int on_pu_edge_y = !(y0 & ((1 << s->ps.sps->log2_min_pu_size) - 1));
if (!size_in_luma_pu_h)
size_in_luma_pu_h++;
if (cand_bottom_left == 1 && on_pu_edge_x) {
-int x_left_pu = ((x0 - 1) >> s->sps->log2_min_pu_size);
+int x_left_pu = ((x0 - 1) >> s->ps.sps->log2_min_pu_size);
int y_bottom_pu =
-((y0 + size_in_luma_v) >> s->sps->log2_min_pu_size);
+((y0 + size_in_luma_v) >> s->ps.sps->log2_min_pu_size);
int max =
((size_in_luma_pu_v) >
- (s->sps->min_pu_height -
- y_bottom_pu) ? (s->sps->min_pu_height -
+ (s->ps.
