diff --git a/core/modules/media/config/schema/media.schema.yml b/core/modules/media/config/schema/media.schema.yml index dad5189..3adeb77 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.local_audio: + type: media.source.field_aware + label: '"Audio" media source configuration' + +media.source.local_video: + 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 + + IHDRetEXtSoftwareAdobe ImageReadyqe< iTXtXML:com.adobe.xmp E:CIDATx]WEeovADdSWE@Ň?QYmaEGdiim=]9LEdu7V5qa̓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/_<9mKKKtt#8uǏ?}d?[QQQUU#bmm-L1B3?zWWe(,,rGLL̽{@(?ct!Bϼ<88TE!aN|RO>sP}ʏ\""??ٳgxq}~cqq9r[}Y&LV;0 ͜!9߿t{{)>7r\v Ooo/ uDVHJJzIqqq1VTT 9 ?sssRB\_rKҦaBb+ZpyLB?p!sR͛ bcczx<#l{_|d$5ϟ[PMTj,..ˁ fqp:L$]??.[j޽k 3-0۷olHxq&0&|7n y1~rz|9-I]Ong#A~KhqF{`=rZ<~8@:@^p#pa ǹa/94n^ |>?ξwd9 p2@`܌5U)C`FEAS LwKB塡!~suuuiiv) ߳gϬU3???00MMM~ ׯ9a itO9Abaa_ƀ((++NX4 f֪x<8䰄9!2- +v`?XagrU-oFrGՙĢ1LLL0cuj. $o0ۇuE`bLo߾lYH@OճO>$-޽ Ƈx^GTKoӄ;AI?g^s.VWWGZ$tJX0ÇH䀄njj +$<8i+͹n!qdMܥѷBVwXvv6YЏ?~§ϲ(9~g~߈BVYWQx'x8d,B=YE u NWMk{DPPAH"1–՝=NX T =D#ɜTCЛ̋,&U~,,,iM$%ςg&`6m/P5CiC0өT)r!?S kxn+q!f!e,677 oM444(B:Uڧ"Sg s +9|Y$ķa8u~ 3 p5rz===%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֊jnAEL,%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ĝqsvsrj#Zό:HYflBByFb9X(--eCQy +~nEiN0B=Yxyyyu9Ç o(i`y!`>ql`w7_YY AZ=@!5 مC9L<#( >9V*INN.,,$mll(Y,2GyK 9r0/ZC:00z}LQQyXQR22AN!/~26p5Φ?VOfff.rK~kkk^R;3o޼Q, >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/[͘>7Y19P666TD.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Іہ Hv8LצTg9z<f ݏ~>98#TOMs|ns0kKK ?|*:p#GW<a9ƶrj%Xyp;+믿MF h`0+0nwOOD܊@!r!@!r!@!rBC 9BC 9a 0-5^5IENDB` \ 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 + + IHDRYIDATxܧ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<-u›Kn4@ 4@ 4@ 4@ք5eJ֞xI~IOset('settings', ['file_extensions' => 'mp3 ogg wav wma aiff 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/LocalVideo.php b/core/modules/media/src/Plugin/media/Source/LocalVideo.php index 0f5e952..cf40b86 100644 --- a/core/modules/media/src/Plugin/media/Source/LocalVideo.php +++ b/core/modules/media/src/Plugin/media/Source/LocalVideo.php @@ -2,6 +2,7 @@ namespace Drupal\media\Plugin\media\Source; +use Drupal\Core\Entity\Display\EntityViewDisplayInterface; use Drupal\media\MediaTypeInterface; /** @@ -14,7 +15,7 @@ * label = @Translation("Video (local)"), * description = @Translation("Use local videos for reusable media."), * allowed_field_types = {"file"}, - * default_thumbnail_filename = "generic.png" + * default_thumbnail_filename = "video.png" * ) */ class LocalVideo extends File { @@ -23,19 +24,16 @@ class LocalVideo extends File { * {@inheritdoc} */ public function createSourceField(MediaTypeInterface $type) { - return parent::createSourceField($type)->set('settings', ['file_extensions' => 'mp4 webm']); + return parent::createSourceField($type)->set('settings', ['file_extensions' => 'mp4 webm ogg ogv']); } /** * {@inheritdoc} */ - public function getDisplayOptions(MediaTypeInterface $type, $display_context) { - if ($display_context == 'view') { - return [ - 'type' => 'file_video', - ]; - } - return []; + 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..53b3001 --- /dev/null +++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php @@ -0,0 +1,62 @@ +doTestCreateMediaType($type_name, $source_id); + + // Check that the source field was created with the correct settings. + $storage = FieldStorageConfig::load("media.$field_name"); + $this->assertNotNull($storage); + $field = FieldConfig::load("media.$type_name.$field_name"); + $this->assertNotNull($field); + $this->assertSame('mp3 ogg wav wma aiff aac', 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->assertNotNull($display); + $formatter = $display->getComponent($field_name)['type']; + $this->assertSame('file_audio', $formatter); + } + + /** + * Check the Local Video source functionality. + */ + public function testVideoTypeCreation() { + $source_id = 'local_video'; + $type_name = 'video_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->assertNotNull($storage); + $field = FieldConfig::load("media.$type_name.$field_name"); + $this->assertNotNull($field); + $this->assertSame('mp4 webm ogg ogv', 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->assertNotNull($display); + $formatter = $display->getComponent($field_name)['type']; + $this->assertSame('file_video', $formatter); + } + +}