diff --git a/core/modules/media/config/schema/media.schema.yml b/core/modules/media/config/schema/media.schema.yml
index dad5189..b9156b2 100644
--- a/core/modules/media/config/schema/media.schema.yml
+++ b/core/modules/media/config/schema/media.schema.yml
@@ -52,6 +52,14 @@ media.source.image:
type: media.source.field_aware
label: '"Image" media source configuration'
+media.source.audio_file:
+ type: media.source.field_aware
+ label: '"Audio" media source configuration'
+
+media.source.video_file:
+ type: media.source.field_aware
+ label: '"Video" media source configuration'
+
media.source.field_aware:
type: mapping
mapping:
diff --git a/core/modules/media/images/icons/audio.png b/core/modules/media/images/icons/audio.png
new file mode 100755
index 0000000..56b3d00
--- /dev/null
+++ b/core/modules/media/images/icons/audio.png
@@ -0,0 +1,15 @@
+PNG
+
+
IHDR e tEXtSoftware Adobe ImageReadyqe< iTXtXML:com.adobe.xmp E: CIDATx]WEeovADdSWE@Ň?QYmaEGdiim=]9LEdu7V5q a̓TWފy_~CC 9BC 9BC !@!r !@!r !@W`6+W/-- 9.5NgCCCFFILL+**Y__rI-3ΐׯ 9.0-BK͖Eʑl!BBB֞3 HIIr\" pF&`#$zM`8 菫W
+9'O8 /_< 9 mKKKtt#8uǏ?}d?[QQQUU#bmm-L1B3?zWWe(,,rGLL̽{@(?ct!Bϼ<88TE!aN|RO>sP}ʏ\""??ٳgxq}~cqq9r[}Y&LV;0
͜!9߿ t{{)>7r\v Ooo/ uD VHJJzIqqq1 VTT 9 ?sssRB\_rKҦaBb+ZpyLB?p!sR͛ bcczx< #l{_|d$5 ϟ[PMTj ,..ˁ fqp:L$]??.[jk
3-0۷olHxq&0&|7n y1~ rz|9-I]Ong#A~KhqF{`=rZ<~8@:@^p#pa ǹa/94n^ |> ?ξwd9 p2@`܌5U )C` FEAS L wKB塡!~suuuiiv) ߳gϬU3???00 MMM~ ׯ9a itO9Abaa_ƀ((++NX4 f֪ x<8䰄9!2-
+v`?Xa grU-oFrGՙĢ1LLL0cuj. $o0ۇuE`bLo߾lYH@Oճ O>$- Ƈx^GTKoӄ;AI?g^s.VWWG Z$tJX0ÇH䀄njj
+$<8i+n!qdM ܥѷBV wXvv6YЏ?~§ϲ(9~g~߈BVYWQx'x8d,B=YE u
NWMk{DPPAH"1՝=NX T =D#ɜTCЛ̋,&U~,,,iM$%ςg&`6m/P 5CiC0өT)r!?S
kxn+q!f!e, 677 oM444(B :Uڧ"Sg s
+9|Y$ķa8u~
3
p 5rz===%P^^T앐ďY@8$b##I!`1K__ 3
s]VV$K].9''8>)hVȡ_y&x|18|R,$v
+ eo{{,y 3(C
XAN;%/g!㋴4~a:xLN'2vvvaXH/Ȝ7RI !)h'3ANIIr@9lj\v;_EYJ 87s 9 beeL4l{SAvR)ʩ/r_|||LܫW7~a9p} 9e٘'nkɏf1ܟvp|A֊jnAE L,%j,,?AjR !(rk_
+ABppp@; KHQC /r,'P*L m !g-?H%B#/ KQ\ bΥngޢ_!0BNv
~pACtr` K'PNc fcB3!rn|:2>#::,8C4QSS Ԧf,`Hr@
*++9#rĝqsvs rj#Zό:HYflBByFb9X(--eCQy
+~nEiN0B=Yxyyyu9Ç o(i`y!`>ql`w7_YY AZ =@!5
مC9L<#(
>9 V*INN.,,$mll(Y,2GyK 9r0/ZC:00z}LQQyXQR22AN!/~26p5Φ?V Offf.rK~kkk^R;3oQ, >FxZ$}LOOó{ V(P, ?ΙMF?\_7(
+>xuꨨ~Ii_SkY 5"G+ՠ9hW}Am
?AB arh溧gjjwP9K{Ilc9 ] n~@ɶ2@8 +z3330!>ڼS_ϷϫB(*eHk_|IZ՜0`>!9/[͘>7Y1 9P666TD.i6< RQHiV;;;w̞q*O?c6Txz}}}Axp8 <`!CaDZzWztt9< _6JX ^z?lfW`6#_|Y\\4bzSHT?֛(1Аu?8S)vaLp|f^?N3I^cE+Utww0 yҷ7PE=-- tʪUBvOȌ80 0#w%!Л5#aҩ) O0'9`@rV-0^ZZ4fC9+PRR٦qWH,3!L+La|?Jg ?n]~E\$x'unǘ u2 4VB6ԅqRͷ~",.`4S+ÞOOO~fІہ Hv8 LצT g9z<f ݏ~>98#TOMs|ns0kKK ?|*:p#GW<a9ƶrj%Xyp;+믿MF
h`0+0 nwOOD܊@!r !@!r !@!rBC 9BC 9a 0 -5^5 IENDB`
\ No newline at end of file
diff --git a/core/modules/media/images/icons/video.png b/core/modules/media/images/icons/video.png
new file mode 100755
index 0000000..17b4816
--- /dev/null
+++ b/core/modules/media/images/icons/video.png
@@ -0,0 +1,7 @@
+PNG
+
+
IHDR Y IDATxܧz0\m:
+[zJ;L0!#1#3پӝGe`\f,{Or'XCSeORΏgFhKB rюFh] Z
4ГZԂ!S<#zKhNqǟWG[[?S7ghaz
+s39
+`z{D
4u>%m57,hh.m.hCq2?ZR)xY^SS Ձ])*{y$RG
4@
4hhZ[fd hi\ P/a)aL~햪 -kA˛o.]~twvQ\ PchُdG2zV:L<-uKn4@
4@
4@
4@ք5eJ֞xI~IOset('settings', ['file_extensions' => 'mp3 wav aac']);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function prepareViewDisplay(MediaTypeInterface $type, EntityViewDisplayInterface $display) {
+ $display->setComponent($this->getSourceFieldDefinition($type)->getName(), [
+ 'type' => 'file_audio',
+ ]);
+ }
+
+}
diff --git a/core/modules/media/src/Plugin/media/Source/VideoFile.php b/core/modules/media/src/Plugin/media/Source/VideoFile.php
new file mode 100644
index 0000000..214d36c
--- /dev/null
+++ b/core/modules/media/src/Plugin/media/Source/VideoFile.php
@@ -0,0 +1,39 @@
+set('settings', ['file_extensions' => 'mp4']);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function prepareViewDisplay(MediaTypeInterface $type, EntityViewDisplayInterface $display) {
+ $display->setComponent($this->getSourceFieldDefinition($type)->getName(), [
+ 'type' => 'file_video',
+ ]);
+ }
+
+}
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php
new file mode 100644
index 0000000..ab78bb8
--- /dev/null
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php
@@ -0,0 +1,105 @@
+assertSession();
+ $page = $this->getSession()->getPage();
+
+ $source_id = 'audio_file';
+ $type_name = 'audio_type';
+ $field_name = 'field_media_' . $source_id;
+ $this->doTestCreateMediaType($type_name, $source_id);
+
+ // Check that the source field was created with the correct settings.
+ $storage = FieldStorageConfig::load("media.$field_name");
+ $this->assertInstanceOf(FieldStorageConfig::class, $storage);
+ $field = FieldConfig::load("media.$type_name.$field_name");
+ $this->assertInstanceOf(FieldConfig::class, $field);
+ $this->assertSame('mp3 ogg wav wma aiff aac m4a', FieldConfig::load("media.$type_name.$field_name")->get('settings')['file_extensions']);
+
+ // Check that the display holds the correct formatter configuration.
+ $display = EntityViewDisplay::load("media.$type_name.default");
+ $this->assertInstanceOf(EntityViewDisplay::class, $display);
+ $formatter = $display->getComponent($field_name)['type'];
+ $this->assertSame('file_audio', $formatter);
+
+ // Create a media asset and verify that the