loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make GL demo easier to understand

Browse Source 
PiperOrigin-RevId: 319007693
This commit is contained in:
olly 2020-06-30 14:14:35 +01:00 committed by Oliver Woodman
parent 20820800f3
commit 5be6eaa88c
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demos/gl/src/main/assets/bitmap_overlay_video_processor_fragment.glsl
View File

@ -32,4 +32,3 @@ void main() {
gl_FragColor = videoColor * (1.0 - overlayColor.a) gl_FragColor = videoColor * (1.0 - overlayColor.a)
+ overlayColor * overlayColor.a; + overlayColor * overlayColor.a;
} }

9
demos/gl/src/main/assets/bitmap_overlay_video_processor_vertex.glsl
View File

@ -11,11 +11,10 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
attribute vec4 a_position; attribute vec2 a_position;
attribute vec3 a_texcoord; attribute vec2 a_texcoord;
varying vec2 v_texcoord; varying vec2 v_texcoord;
void main() { void main() {
gl_Position = a_position; gl_Position = vec4(a_position.x, a_position.y, 0, 1);
v_texcoord = a_texcoord.xy; v_texcoord = a_texcoord;
} }

13
demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/BitmapOverlayVideoProcessor.java
View File

@ -88,18 +88,9 @@ import javax.microedition.khronos.opengles.GL10;
GlUtil.Uniform[] uniforms = GlUtil.getUniforms(program); GlUtil.Uniform[] uniforms = GlUtil.getUniforms(program);
for (GlUtil.Attribute attribute : attributes) { for (GlUtil.Attribute attribute : attributes) {
if (attribute.name.equals("a_position")) { if (attribute.name.equals("a_position")) {
attribute.setBuffer( attribute.setBuffer(new float[] {-1, -1, 1, -1, -1, 1, 1, 1}, 2);
new float[] {
-1.0f, -1.0f, 0.0f, 1.0f, 1.0f, -1.0f, 0.0f, 1.0f, -1.0f, 1.0f, 0.0f, 1.0f, 1.0f,
1.0f, 0.0f, 1.0f,
},
4);
} else if (attribute.name.equals("a_texcoord")) { } else if (attribute.name.equals("a_texcoord")) {
attribute.setBuffer( attribute.setBuffer(new float[] {0, 1, 1, 1, 0, 0, 1, 0}, 2);
new float[] {
0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f,
},
3);
} }
} }
this.attributes = attributes; this.attributes = attributes;

1
demos/gl/src/main/res/layout/main_activity.xml
View File

@ -27,4 +27,3 @@
app:surface_type="none"/> app:surface_type="none"/>
</FrameLayout> </FrameLayout>