Skip to content

Commit

Permalink
Roll src/third_party/ffmpeg/ 8d21d41d8..881c5c3f6 (635 commits)
Browse files Browse the repository at this point in the history
https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/8d21d41d8bec..881c5c3f6412

$ git log 8d21d41d8..881c5c3f6 --date=short --no-merges --format='%ad %ae %s'
2023-06-01 liberato FFMpeg roll for M116
2023-05-23 git lavif/vf_libplacebo: move code (cosmetic)
2023-05-23 git lavfi/vf_libplacebo: update settings after adding hooks
2023-05-23 anton fate/tests/ffmpeg: use -idct simple for fate-ffmpeg-input-r
2023-05-20 jamrial avcodec/libdav1d: only return EAGAIN when there are no buffered packets
(...)
2023-03-31 jamrial doc/encoders: add an entry for the frame_length option from libfdk-aac
2023-03-30 info avcodec/libfdk-accenc: Add option to set frame length when encoding with libfdk_aac
2023-03-08 haihao.xiang lavfi/vf_vpp_qsv: only add the given output sw format to output pad
2023-03-30 onemda avfilter/af_rubberband: use correct array for multichannels
2023-03-03 jack.wgm libavformat/tcp: add local_addr/local_port for network option

Created with:
  roll-dep src/third_party/ffmpeg

Bug: 1449369
Change-Id: Ic080cf932bbc26daf34a2e22b76464650d925618
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4585290
Reviewed-by: Dale Curtis <[email protected]>
Commit-Queue: Frank Liberato <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1154671}
  • Loading branch information
liberato-at-chromium authored and chromium-wpt-export-bot committed Jun 8, 2023
1 parent 16ab2e7 commit 41854b0
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions common/media.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ function getVideoURI(base)

var videotag = document.createElement("video");

if ( videotag.canPlayType &&
videotag.canPlayType('video/ogg; codecs="theora, vorbis"') )
if ( videotag.canPlayType )
{
extension = '.ogv';
if (videotag.canPlayType('video/webm; codecs="vp9, opus"') )
{
extension = '.webm';
} else if ( videotag.canPlayType('video/ogg; codecs="theora, vorbis"') )
{
extension = '.ogv';
}
}

return base + extension;
Expand Down Expand Up @@ -46,10 +51,11 @@ function getAudioURI(base)
function getMediaContentType(url) {
var extension = new URL(url, location).pathname.split(".").pop();
var map = {
"mp4": "video/mp4",
"ogv": "application/ogg",
"mp3": "audio/mp3",
"oga": "application/ogg",
"mp4" : "video/mp4",
"ogv" : "application/ogg",
"webm": "video/webm",
"mp3" : "audio/mp3",
"oga" : "application/ogg",
};
return map[extension];
}
Binary file not shown.
Binary file added images/pattern.webm
Binary file not shown.
Binary file added media/2x2-green.webm
Binary file not shown.
Binary file added media/A4.webm
Binary file not shown.
Binary file added media/counting.webm
Binary file not shown.
Binary file added media/green-at-15.webm
Binary file not shown.
Binary file added media/movie_300.webm
Binary file not shown.
Binary file added media/movie_5.webm
Binary file not shown.
Binary file added media/test.webm
Binary file not shown.
Binary file added media/video.webm
Binary file not shown.

0 comments on commit 41854b0

Please sign in to comment.