diff --git a/core/modules/media/config/schema/media.schema.yml b/core/modules/media/config/schema/media.schema.yml
index 50a285b..59a0e68 100644
--- a/core/modules/media/config/schema/media.schema.yml
+++ b/core/modules/media/config/schema/media.schema.yml
@@ -40,6 +40,10 @@ media.source.file:
type: media.source.field_aware
label: 'File handler configuration'
+media.handler.image:
+ type: media.handler.field_aware
+ label: 'Image handler configuration'
+
action.configuration.media_delete_action:
type: action_configuration_default
label: 'Delete media configuration'
diff --git a/core/modules/media/images/icons/no-thumbnail.png b/core/modules/media/images/icons/no-thumbnail.png
new file mode 100644
index 0000000..66fb4d9
--- /dev/null
+++ b/core/modules/media/images/icons/no-thumbnail.png
@@ -0,0 +1,6 @@
+PNG
+
+
IHDR e tEXtSoftware Adobe ImageReadyqe< 0IDATx1O"[ݛb6TRQYA4Ra 쬬
+o
+=+2,sȲ{z4wf<3~zߤe# Cp!8 CCp!8 CpHp!8 Cp !8 Cp!8$8 Cp!8 C [sjvoWRQ.7
x}}}~~ެM}ʟZ >f8 Vl.tJҊq K+t)d %.tp.~8rh4pDa[%H>XpG 8 8 8 8 8 8 8v ˫fpcy'''Jpcy".pt:y9pg`Sן
+Gp D Fk]7_Q*:NőFC?JjZQx /߿ ñ t-F $cEFbqttG:[uRZdőWaEEF8 Tq{{;L$͑ @p"#ɘ_X]d±4D(Ԏm%(d±sd
c,ZV: S.|qZz-GD Gh4 #'UÑ8]/pNFp⎪鷀{H\<#
]k"HҜ[^WZM>,NX^^/|x:uss3W*|l {g=o9S8" p< ( s#v2Y#q8j9>Ҳ4]xyKr},|\yqtmAp,Yl-h[[y{{[롴?Z\N L988G%^l!cEp!8 CpHp!8 Cp !8 Cp!8$8 Cp!8 Cp!8 CpmA 0 {b~a IENDB`
\ No newline at end of file
diff --git a/core/modules/media/src/Plugin/media/Source/Image.php b/core/modules/media/src/Plugin/media/Source/Image.php
new file mode 100644
index 0000000..c8d64f8
--- /dev/null
+++ b/core/modules/media/src/Plugin/media/Source/Image.php
@@ -0,0 +1,246 @@
+imageFactory = $image_factory;
+ $this->fileSystem = $file_system;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+ return new static(
+ $configuration,
+ $plugin_id,
+ $plugin_definition,
+ $container->get('entity_type.manager'),
+ $container->get('entity_field.manager'),
+ $container->get('config.factory'),
+ $container->get('plugin.manager.field.field_type'),
+ $container->get('image.factory'),
+ $container->get('file_system')
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getMetadataAttributes() {
+ $attributes = parent::getMetadataAttributes();
+
+ $attributes += [
+ 'width' => $this->t('Width'),
+ 'height' => $this->t('Height'),
+ ];
+
+ if ($this->canReadExifData()) {
+ $attributes += [
+ 'model' => $this->t('Camera model'),
+ 'created' => $this->t('Image creation datetime'),
+ 'iso' => $this->t('Iso'),
+ 'exposure' => $this->t('Exposure time'),
+ 'aperture' => $this->t('Aperture value'),
+ 'focal_length' => $this->t('Focal length'),
+ ];
+ }
+
+ return $attributes;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getMetadata(MediaInterface $media, $name) {
+ $value = parent::getMetadata($media, $name);
+
+ if ($value !== NULL) {
+ return $value;
+ }
+
+ // Get the file, image and EXIF data.
+ /** @var \Drupal\file\FileInterface $file */
+ $file = $media->get($this->configuration['source_field'])->entity;
+ $uri = $file->getFileUri();
+ $image = $this->imageFactory->get($uri);
+
+ // Return the field.
+ switch ($name) {
+ case 'width':
+ return $image->getWidth() ?: FALSE;
+
+ case 'height':
+ return $image->getHeight() ?: FALSE;
+
+ case 'thumbnail_uri':
+ return $file->getFileUri();
+ }
+
+ if ($this->canReadExifData()) {
+ switch ($name) {
+ case 'created':
+ /** @var \DateTime $date */
+ $date = new DrupalDateTime($this->getExifField($uri, 'DateTimeOriginal'));
+ return $date->getTimestamp();
+
+ case 'model':
+ return $this->getExifField($uri, 'Model');
+
+ case 'iso':
+ return $this->getExifField($uri, 'ISOSpeedRatings');
+
+ case 'exposure':
+ return $this->getExifField($uri, 'ExposureTime');
+
+ case 'aperture':
+ return $this->getExifField($uri, 'FNumber');
+
+ case 'focal_length':
+ return $this->getExifField($uri, 'FocalLength');
+ }
+ }
+
+ return NULL;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+ $form = parent::buildConfigurationForm($form, $form_state);
+
+ // Show message if it's not possible to read EXIF data.
+ if (!$this->canReadExifData()) {
+ $form['no_exif_data_reader'] = [
+ '#markup' => $this->t('Unable to read EXIF data for Image. In order to provide EXIF data reading functionality please take a look at PHP documentation of exif_read_data function.'),
+ ];
+ }
+
+ return $form;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getDefaultThumbnail() {
+ return $this->configFactory->get('media.settings')
+ ->get('icon_base') . '/no-thumbnail.png';
+ }
+
+ /**
+ * Check does functionality for reading EXIF data exist.
+ *
+ * @return bool
+ * Returns TRUE if functionality for reading of EXIF data is provided.
+ */
+ protected function canReadExifData() {
+ return function_exists('exif_read_data');
+ }
+
+ /**
+ * Get EXIF field value.
+ *
+ * @param string $uri
+ * The uri for the file that we are getting the EXIF.
+ * @param string $field
+ * The name of the EXIF field.
+ *
+ * @return string|bool
+ * The value for the requested field or FALSE if is not set.
+ */
+ protected function getExifField($uri, $field) {
+ if (empty($this->exif)) {
+ $this->exif = $this->getExifData($uri);
+ }
+
+ return $this->exif[$field] ?: FALSE;
+ }
+
+ /**
+ * Read EXIF.
+ *
+ * @param string $uri
+ * The uri for the file that we are getting the Exif.
+ *
+ * @return array|bool
+ * An associative array where the array indexes are the header names and
+ * the array values are the values associated with those headers or FALSE
+ * if the data can't be read.
+ */
+ protected function getExifData($uri) {
+ return exif_read_data($this->fileSystem->realpath($uri), 'EXIF');
+ }
+
+}
diff --git a/core/modules/media/tests/fixtures/exif_example.jpeg b/core/modules/media/tests/fixtures/exif_example.jpeg
new file mode 100644
index 0000000..2cba9b9
--- /dev/null
+++ b/core/modules/media/tests/fixtures/exif_example.jpeg
@@ -0,0 +1,50 @@
+ JFIF H H Exif MM * b v ~( i % Drupal EXIF Camera H H 0210 0100 N E 4 `
Ə http://ns.adobe.com/xap/1.0/
+
+
+
+
+ Drupal EXIF Camera
+ 72
+ 72
+ Inch
+ Centered
+ Exif Version 2.1
+ FlashPix Version 1.0
+ Uncalibrated
+ N
+ 52, 30, 32.751
+ E
+ 13, 22, 25.5432
+
+
+
+
+
+ C
+
+
+
C
Y H N Ƌ`:Q&Y 9nZl(-p㓟{'h \R@o3uv'N %Wi}c ʭ0 E-% +[}[ /OI^fdp,Ć^_?}:ΞQ]gYh2Z]ՋEgDhf )ɋK0q,LGd uV٭N#kOHW+Tס_D;|t!ΪNrvb=%qkMtQ#}vw]vHxzysl_i-v tv¯\.Ыj]] $:o,o>ma_[
+Ȕ JYԷ + 콟C !yWK?܋2 j U潲˅ˤQX ' 6@03P H}jr5 fKl\m5
qYqhc i8Ǻ7}Fzetc4
+B/,(
%UR:sZy<ٖ.~ɟR`=
^%#?1ZwFh?;3Z#.K ֓8#s;qWB/(]iCI
=*@/.&{ ')Mt ZQ5Xn5P𛇤JfKʻ s}%eg"d!?iqIp kůhU衈>=քN6:~J )anjZYp{YgPMR\Q;5vA*>2m YC[~(SHl"ٵk֦%r- ?@Mi7D$lSC `Yt4t 77:*8LW~ isR7+C(lyԋLW')5UԷzN L4JEEX@=hI¤%p4Ji"$nqՑ@Á5|PT*AB )r)܂>XԬ='l> JSs=¡,|U LJ%! !G\uTgz j34SWƀ`*I@dc" ѧ:5C6Th2iԞ'iS!
q(5m͑{fO}yM)Y>tJS]
j hKvȓ
+"RpVڑFb!Ѵf_sܝf 9¶{CN# <+ШܺEQ4VX'g : !"1A#2Qq 0@a45R$3Pc ?QDq }(Oz4*TЎ7ړ
+ [$^֯B Ԝ9? ôu :ţ]jrUՆd0RU .%ar
ԑ:z`nα
eJM#)Dd1` 6OÃUY_v 쿟SumwjOrJ
⧢teN\ 7+4#!w 5Cw)~'K{5{t%u$y
]b_J_a)`5Q.,sQ*.<
V,$V2ǹ;O M8iM1~ ¤]' GϢr,C3tq6M u(mK(VR0i0,+
mRӪaar6 _L[ҏXq0|0_ *!5 Oݛʗ&;P>T]Sx=1
+ް)TÉLK >Z]BO/Ʈ( $m7~sFϟ4}i*̖AvK9^bӎi yR F t)EszU\Gp@d:| C !1"AQaq2B #@0RSTbrs$3P ? 36S(2wT&kkw~r^Pt7a@$2a,Lˌ:ie #4dD Ǘlk߸oɓ|#nfBU++BBhD&Z}^0
+|Nr]5n /
+Juro=U ֏J$|PnjqJOخ5XeA{Tc"? ԕ ѬWU7DZUr?dJm*0ے( OeUv鷘KpG&YNjCvE)WD
+i!xQƔn]d ja! 90U'! o! T Y/+ XS*$mH(AwJ)- БS&0haJkFQNN/Q0 *dڽh-8ȴEBwy^ȓߨM'bArGtK!62xD 3CJSRxԟl).v $") _Ma]&w\2n)w~9S?Q/6txGL#"^szjV6 +Nix\GK&Y҂kw2ᇦՃj5L4f/P6ƧiR G th,S(J x (vj NDzyg_v_[^d _cbe
+@Y'L)Lxȥ2ҐG,O}* iE_1Ӡe+Dޛ>3&~f6ML~k8T @"[ @-ɥ1Yܸ
TbhSJfbm
4}X.N ,~MJ6%BV (]w# @Iԓ`Q%5b9 K1"l
+@3% |mZB`yzI}SgJ= 0ًz,v4 g]I 3 G$I$I$rI$I$*I$I$)Sl$I$Dm%I$Lm%5 so{BjNdrrI$$I$I$AI$I$I$I$I$O * !1AQaq@ 0P ?ɘDvҍ;] qV~6XUnjX+yv-Rn^)_K
JtA} x֖\.Ƅ AΞz)J6%7[a-IJUf"#zEl ! bH7C@+9j u@-lUB:SY qĢ$_ 5*o*Oabj;PÀ-7]=@Dv58]1]37 M76MN{U ^p|-eאVL wPO:ߍhcC9Q5αu6{W ;2U({RAVF
+ f&+`} #a8ڈA3paDPDUIn# WUb[/sB W"Ѽ w 4E7 F{kI%t\T],;V+-zik$J!eY|˭ ,Ɔ=uC33B6H,,̓h-ڇ8ne LY lҏ V܋k9kS*qʀ,Ӏǘ LVLbm,c.νP5kEI b3`>? O1a[k
+ 8D4jz?
@KA>_ sȤ`!/ 3 * !1AQaq@ 0P ?
+n_oB5 xcRNRZ$O/'/=i7q:ڈD"L%<~v^X}eeC u @Y j' Î^)ǙHʅ3.'e9tyCЏy0KąSTNRFR< m³&gNU ybDֳP5ӝB149Nc]:
1_^FVĦtʭRU鹣z4S 5}IB
+pUȃǖbxGύӒ yso
+1cX aYvlrŇQY<{SI@7Kछ+8s484;E0]+Yy]3پXkСWl"oPd̴sʅ ԈjE]Rա
ÏlFX-k e^b Ned&81 p,$
R hFdIl~.i7u1$\, Hi&#^ C9+?QX0bRG= *a9CJbiٟ } D#}U+|Ten9.Rol1b528$nMgšɗE tJ0E)u~+SL & !1AQaq @0P ?;Y(>*Tʯ $s pF-JJ$4 Z`ZiHM|AD y b0[f)ۿG]W& c^gXTRW
@HD)Qi ϑP1
+0FTv3^1*x4} !meKTUniK GQ&6L~]-d (%᎐qS!rU^qtQ v
P9@khKKwfD5j;{ޏMGuC hV@1Qކa#6 r^~FF ǒhbE;K5?YcB2G&ƃgWgPlRgetSession();
+ $page = $session->getPage();
+ $assert_session = $this->assertSession();
+
+ // Create image media source.
+ $this->createMediaTypeTest($type_name, 'image', $provided_fields);
+
+ // Create a supported and a non-supported field.
+ $fields = [
+ 'field_string_mime' => 'string',
+ 'field_string_width' => 'string',
+ 'field_string_model' => 'string',
+ ];
+ $this->createMediaFields($fields, $type_name);
+
+ // Hide the media name to test default name generation.
+ $this->hideMediaField('name', $type_name);
+
+ $this->drupalGet("admin/structure/media/manage/$type_name");
+ $page->selectFieldOption("field_map[mime]", 'field_string_mime');
+ $page->selectFieldOption("field_map[width]", 'field_string_width');
+ $page->selectFieldOption("field_map[model]", 'field_string_model');
+ $page->pressButton('Save');
+
+ // Create a media item.
+ $this->drupalGet("media/add/{$type_name}");
+ $page->attachFileToField("files[{$source_field_id}_0]", \Drupal::root() . '/core/modules/media/tests/fixtures/exif_example.jpeg');
+ $assert_session->assertWaitOnAjaxRequest();
+ $page->fillField("{$source_field_id}[0][alt]", 'EXIF Image Alt Text');
+ $page->pressButton('Save and publish');
+
+ $assert_session->addressEquals('media/1');
+
+ // Make sure the thumbnail is created from uploaded image.
+ $assert_session->elementAttributeContains('css', '.image-style-thumbnail', 'src', 'exif_example.jpeg');
+
+ // Load the media and check that all fields are properly populated.
+ $media = Media::load(1);
+ $this->assertEquals('exif_example.jpeg', $media->label());
+ $this->assertEquals('Drupal EXIF Camera', $media->get('field_string_model')->value);
+ $this->assertEquals('200', $media->get('field_string_width')->value);
+ $this->assertEquals('image/jpeg', $media->get('field_string_mime')->value);
+ }
+
+}
diff --git a/core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml b/core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml
new file mode 100644
index 0000000..a040f31
--- /dev/null
+++ b/core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml
@@ -0,0 +1,46 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.media.image.field_media_image
+ - image.style.thumbnail
+ - media.type.image
+ module:
+ - image
+id: media.image.default
+targetEntityType: media
+bundle: image
+mode: default
+content:
+ created:
+ type: datetime_timestamp
+ weight: 10
+ region: content
+ settings: { }
+ third_party_settings: { }
+ field_media_image:
+ settings:
+ progress_indicator: throbber
+ preview_image_style: thumbnail
+ third_party_settings: { }
+ type: image_image
+ weight: 26
+ region: content
+ name:
+ type: string_textfield
+ weight: -5
+ region: content
+ settings:
+ size: 60
+ placeholder: ''
+ third_party_settings: { }
+ uid:
+ type: entity_reference_autocomplete
+ weight: 5
+ settings:
+ match_operator: CONTAINS
+ size: 60
+ placeholder: ''
+ region: content
+ third_party_settings: { }
+hidden: { }
diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml
new file mode 100644
index 0000000..e541d7f
--- /dev/null
+++ b/core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml
@@ -0,0 +1,51 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.media.image.field_media_image
+ - image.style.thumbnail
+ - media.type.image
+ module:
+ - image
+ - user
+id: media.image.default
+targetEntityType: media
+bundle: image
+mode: default
+content:
+ created:
+ label: hidden
+ type: timestamp
+ weight: 0
+ region: content
+ settings:
+ date_format: medium
+ custom_date_format: ''
+ timezone: ''
+ third_party_settings: { }
+ field_media_image:
+ label: above
+ settings:
+ image_style: ''
+ image_link: ''
+ third_party_settings: { }
+ type: image
+ weight: 6
+ region: content
+ thumbnail:
+ type: image
+ weight: 5
+ label: hidden
+ settings:
+ image_style: thumbnail
+ image_link: ''
+ region: content
+ third_party_settings: { }
+ uid:
+ label: hidden
+ type: author
+ weight: 0
+ region: content
+ settings: { }
+ third_party_settings: { }
+hidden: { }
diff --git a/core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml b/core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml
new file mode 100644
index 0000000..628c386
--- /dev/null
+++ b/core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml
@@ -0,0 +1,40 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.media.field_media_image
+ - media.type.image
+ module:
+ - image
+ enforced:
+ module:
+ - media
+id: media.image.field_media_image
+field_name: field_media_image
+entity_type: media
+bundle: image
+label: field_media_image
+description: ''
+required: false
+translatable: true
+default_value: { }
+default_value_callback: ''
+settings:
+ file_extensions: 'png gif jpg jpeg'
+ alt_field: true
+ alt_field_required: true
+ title_field: false
+ title_field_required: false
+ max_resolution: ''
+ min_resolution: ''
+ default_image:
+ uuid: null
+ alt: ''
+ title: ''
+ width: null
+ height: null
+ file_directory: '[date:custom:Y]-[date:custom:m]'
+ max_filesize: ''
+ handler: 'default:file'
+ handler_settings: { }
+field_type: image
diff --git a/core/profiles/standard/config/optional/field.storage.media.field_media_image.yml b/core/profiles/standard/config/optional/field.storage.media.field_media_image.yml
new file mode 100644
index 0000000..1597ce6
--- /dev/null
+++ b/core/profiles/standard/config/optional/field.storage.media.field_media_image.yml
@@ -0,0 +1,32 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - file
+ - image
+ - media
+ enforced:
+ module:
+ - media
+id: media.field_media_image
+field_name: field_media_image
+entity_type: media
+type: image
+settings:
+ default_image:
+ uuid: null
+ alt: ''
+ title: ''
+ width: null
+ height: null
+ target_type: file
+ display_field: false
+ display_default: false
+ uri_scheme: public
+module: image
+locked: false
+cardinality: 1
+translatable: true
+indexes: { }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/core/profiles/standard/config/optional/media.type.image.yml b/core/profiles/standard/config/optional/media.type.image.yml
new file mode 100644
index 0000000..a823e03
--- /dev/null
+++ b/core/profiles/standard/config/optional/media.type.image.yml
@@ -0,0 +1,14 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - media
+id: image
+label: Image
+description: 'Use the "Image" media type for uploading local images.'
+handler: image
+queue_thumbnail_downloads: false
+new_revision: false
+handler_configuration:
+ source_field: field_media_image
+field_map: { }