History

avfilter/vf_datascope: fix oscilloscope with gray>8 depth

Paul B Mahol committed 6 years ago

Commit cdc4c261 parent 52d362c1 file · +6 −6Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/vf_datascope.c+6−6
@@ -791,7 +791,7 @@ static void draw_line(FFDrawContext *draw, int x0, int y0, int x1, int y1, · 790 unmodified lines
791791 for (p = 0; p < draw->nb_planes; p++) {
792792 if (draw->desc->comp[p].depth == 8) {
793793 if (draw->nb_planes == 1) {
794− for (i = 0; i < 4; i++) {
794+ for (i = 0; i < draw->desc->nb_components; i++) {
795795 out->data[0][y0 * out->linesize[0] + x0 * draw->pixelstep[0] + i] = color->comp[0].u8[i];
796796 }
797797 } else {
@@ -799,8 +799,8 @@ static void draw_line(FFDrawContext *draw, int x0, int y0, int x1, int y1, · 1 unmodified line
799799 }
800800 } else {
801801 if (draw->nb_planes == 1) {
802− for (i = 0; i < 4; i++) {
803− AV_WN16(out->data[0] + y0 * out->linesize[0] + 2 * (x0 * draw->pixelstep[0] + i), color->comp[0].u16[i]);
802+ for (i = 0; i < draw->desc->nb_components; i++) {
803+ AV_WN16(out->data[0] + y0 * out->linesize[0] + (x0 * draw->pixelstep[0] + i), color->comp[0].u16[i]);
804804 }
805805 } else {
806806 AV_WN16(out->data[p] + out->linesize[p] * (y0 >> draw->vsub[p]) + (x0 >> draw->hsub[p]) * 2, color->comp[p].u16[0]);
@@ -965,7 +965,7 @@ static void draw_scope(OscilloscopeContext *s, int x0, int y0, int x1, int y1, · 158 unmodified lines
965965 if (s->draw.nb_planes == 1) {
966966 int i;
967967
968− for (i = 0; i < s->draw.pixelstep[0]; i++)
968+ for (i = 0; i < s->nb_comps; i++)
969969 out->data[0][out->linesize[0] * y0 + x0 * s->draw.pixelstep[0] + i] = 255 * ((s->nb_values + state) & 1);
970970 } else {
971971 out->data[0][out->linesize[0] * y0 + x0] = 255 * ((s->nb_values + state) & 1);
@@ -974,8 +974,8 @@ static void draw_scope(OscilloscopeContext *s, int x0, int y0, int x1, int y1, · 2 unmodified lines
974974 if (s->draw.nb_planes == 1) {
975975 int i;
976976
977− for (i = 0; i < s->draw.pixelstep[0]; i++)
978− AV_WN16(out->data[0] + out->linesize[0] * y0 + 2 * x0 * (s->draw.pixelstep[0] + i), (s->max - 1) * ((s->nb_values + state) & 1));
977+ for (i = 0; i < s->nb_comps; i++)
978+ AV_WN16(out->data[0] + out->linesize[0] * y0 + x0 * s->draw.pixelstep[0] + i, (s->max - 1) * ((s->nb_values + state) & 1));
979979 } else {
980980 AV_WN16(out->data[0] + out->linesize[0] * y0 + 2 * x0, (s->max - 1) * ((s->nb_values + state) & 1));
981981 }

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