Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bf198c3 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "Fix MediaExtractor.getDrmInitData implementation for webm" into nyc-dev

parents 7eb716c0 c67abec6
Loading
Loading
Loading
Loading
+16 −9
Original line number Original line Diff line number Diff line
@@ -275,8 +275,14 @@ final public class MediaExtractor {
                    return initDataMap.get(schemeUuid);
                    return initDataMap.get(schemeUuid);
                }
                }
            };
            };
        } else if (formatMap.containsKey("crypto-key")) {
        } else {
            ByteBuffer buf = (ByteBuffer) formatMap.get("crypto-key");
            int numTracks = getTrackCount();
            for (int i = 0; i < numTracks; ++i) {
                Map<String, Object> trackFormatMap = getTrackFormatNative(i);
                if (!trackFormatMap.containsKey("crypto-key")) {
                    continue;
                }
                ByteBuffer buf = (ByteBuffer) trackFormatMap.get("crypto-key");
                buf.rewind();
                buf.rewind();
                final byte[] data = new byte[buf.remaining()];
                final byte[] data = new byte[buf.remaining()];
                buf.get(data);
                buf.get(data);
@@ -286,6 +292,7 @@ final public class MediaExtractor {
                    }
                    }
                };
                };
            }
            }
        }
        return null;
        return null;
    }
    }