_NumcodecsArrayArrayCodec._encode_sync does not reshape the data on encode #4553

diff --git a/src/zarr/codecs/numcodecs/_codecs.py b/src/zarr/codecs/numcodecs/_codecs.py
index c9807431..12b7cd4a 100644
--- a/src/zarr/codecs/numcodecs/_codecs.py
+++ b/src/zarr/codecs/numcodecs/_codecs.py
@@ -164,7 +164,11 @@ class _NumcodecsArrayArrayCodec(_NumcodecsCodec, ArrayArrayCodec):
         # would be encoded in transposed element order (gh-3558)
         chunk_ndarray = np.ascontiguousarray(chunk_data.as_ndarray_like())
         out = self._codec.encode(chunk_ndarray)
-        return chunk_spec.prototype.nd_buffer.from_ndarray_like(out)
+        # numcodecs filters return a flattened array; restore the shape this
+        # codec declares, so that the next codec (e.g. an image serializer)
+        # receives a chunk of the shape given by `resolve_metadata`
+        out_shape = self.resolve_metadata(chunk_spec).shape
+        return chunk_spec.prototype.nd_buffer.from_ndarray_like(out.reshape(out_shape))

     async def _encode_single(self, chunk_data: NDBuffer, chunk_spec: ArraySpec) -> NDBuffer:
         return await asyncio.to_thread(self._encode_sync, chunk_data, chunk_spec)
diff --git a/tests/test_codecs/test_numcodecs.py b/tests/test_codecs/test_numcodecs.py
index d78b73f3..902b5294 100644
--- a/tests/test_codecs/test_numcodecs.py
+++ b/tests/test_codecs/test_numcodecs.py
@@ -11,6 +11,9 @@ from numcodecs import GZip
 from zarr import config, create_array, open_array
 from zarr.abc.numcodec import _is_numcodec, _is_numcodec_cls
 from zarr.codecs import numcodecs as _numcodecs
+from zarr.core.array_spec import ArrayConfig, ArraySpec
+from zarr.core.buffer import default_buffer_prototype
+from zarr.core.dtype import get_data_type_from_native_dtype
 from zarr.errors import UnknownCodecError
 from zarr.registry import get_codec_class, get_numcodec

@@ -192,6 +195,44 @@ def test_generic_filter_f_contiguous(
     np.testing.assert_array_equal(data, a[:, :])


+@pytest.mark.parametrize(
+    ("codec", "dtype"),
+    [
+        (_numcodecs.Delta(dtype="uint16"), "uint16"),
+        (_numcodecs.FixedScaleOffset(offset=0, scale=0.25, dtype="<u2", astype="<u2"), "uint16"),
+        (_numcodecs.AsType(encode_dtype="float64", decode_dtype="float32"), "float32"),
+        (_numcodecs.BitRound(keepbits=10), "float32"),
+        (_numcodecs.Quantize(digits=3, dtype="float32"), "float32"),
+        (_numcodecs.PackBits(), "bool"),
+    ],
+    ids=["delta", "fixedscaleoffset", "astype", "bitround", "quantize", "packbits"],
+)
+def test_generic_filter_encoded_shape(
+    codec: _numcodecs._NumcodecsArrayArrayCodec, dtype: str
+) -> None:
+    # numcodecs filters return flattened arrays; the encoded chunk must have the
+    # shape declared by `resolve_metadata`, or the next codec (e.g. an image
+    # serializer) receives a 1D chunk
+    if dtype == "bool":
+        data = np.tril(np.ones((16, 32), dtype=bool))
+    else:
+        data = (np.arange(16 * 32).reshape(16, 32) * 4).astype(dtype)
+    zdtype = get_data_type_from_native_dtype(data.dtype)
+    spec = ArraySpec(
+        shape=data.shape,
+        dtype=zdtype,
+        fill_value=zdtype.cast_scalar(0),
+        config=ArrayConfig(order="C", write_empty_chunks=True),
+        prototype=default_buffer_prototype(),
+    )
+    nd_buf = default_buffer_prototype().nd_buffer.from_numpy_array(data)
+
+    encoded = codec._encode_sync(nd_buf, spec)
+    assert encoded.shape == codec.resolve_metadata(spec).shape
+    decoded = codec._decode_sync(encoded, spec)
+    assert decoded.shape == data.shape
+
+
 def test_generic_filter_bitround() -> None:
     data = np.linspace(0, 1, 256, dtype="float32").reshape((16, 16))